Skip to content

G
gdtel-gztel-school-center
Commit 31186b9c by 董有沛
Options

Merge branch 'master' of http://172.18.101.172:9091/dedema/gdtel-gztel-school-center.git

parents a22e7af3 a35c0ca2
Showing with 1213 additions and 127 deletions
README.md 0 → 100644
1. common：公共模块
2. core-service：框架核心模块
3. gateway：框架网关
4. service-manager：系统内主要模块功能
5. task：系统内定时服务模块
6. eureka：框架内服务管理
7. old-user：老用户模块
8. new-user：新用户模块
9. renewal-user：老用户续约模块
10. apply-net：宽带办理模块
\ No newline at end of file
common/src/main/java/com/winsun/bean/HhrXyzxYdYrymList.java 0 → 100644
package com.winsun.bean;
import java.io.Serializable;
/**
* (HhrXyzxYdYrymList)实体类
*
* @author makejava
* @since 2020-02-25 11:27:38
*/
public class HhrXyzxYdYrymList implements Serializable {
private static final long serialVersionUID = 875561304997228718L;
/**
* 月份
*/
private Integer monthId;
/**
* 主键标识
*/
private Double servId;
/**
* 局向
*/
private String substName;
/**
* 学校
*/
private String schoolName;
/**
* 用户类型（单宽 单移 融合）
*/
private String userType;
/**
* 是否具备提速条件
*/
private String isPreTs;
/**
* 姓名
*/
private String custName;
/**
* 身份证号码
*/
private String socialId;
/**
* 手机号码
*/
private String accNbr;
/**
* 入网时间
*/
private Object finishDate;
/**
* 网龄
*/
private Double rwDate;
/**
* 手机当前套餐
*/
private String cdmaDiscDesc;
/**
* 是否受理“YD4G03-252-1-4”
*/
private String isBltc1;
/**
* 是否受理“YD4G03-252-1-5”
*/
private String isBltc2;
/**
* 是否受理“YD4G03-268-1-1”
*/
private String isBltc3;
/**
* 用户状态
*/
private String stateDesc;
/**
* 停机时间
*/
private String stopDate;
/**
* 是否融合
*/
private String isGlkd;
/**
* T-3月出账金额
*/
private Double feeT3;
/**
* T-2月出账金额
*/
private Double feeT2;
/**
* T-1月出账金额
*/
private Double feeT1;
/**
* 近三个月平均出账金额(程序跑)
*/
private Double avgFee;
/**
* 网点编码
*/
private String channelNbr;
/**
* 网点名称
*/
private String channelName;
/**
* 代理商
*/
private String dlsName;
/**
* 移动号码本金余额
*/
private Double feeBj;
/**
* T-1月是否活跃(程序跑)
*/
private String isHyt1;
/**
* T-1月是否有效(程序跑)
*/
private String isYxt1;
/**
* T-1月开机天数
*/
private Integer kjTsT1;
/**
* T-1月流量
*/
private Double stmDataT1;
/**
* T-1月主叫时长
*/
private Double mouCallT1;
/**
* T-1月短信
*/
private Integer mgsCountsT1;
/**
* 是否受理X00022449
*/
private String isBltc4;
/**
* 受理几次X00022449
*/
private Integer bltcNum;
/**
* 宽带接入号
*/
private String accNbrKd;
/**
* 多媒体账号
*/
private String accNbr2;
/**
* 域名
*/
private String yuName;
/**
* 宽带入网时间
*/
private Object createDateKd;
/**
* 宽带号码是否活跃(亚飞提供)
*/
private String isHyKd;
/**
* 网龄(程序跑)
*/
private Double rwDateKd;
/**
* 主套餐
*/
private String kdDiscName;
/**
* 是否受理“DM0002-A01 （0元宽带标识）
*/
private String is0ykd;
/**
* 宽带速率
*/
private Integer speedValue;
/**
* 宽带体验速率
*/
private Integer speedTyValue;
/**
* 速率(宽带速率和体验速率取较大值)
*/
private Integer speedKd;
/**
* 当前用户状态
*/
private String kdStateDesc;
/**
* 停机时间
*/
private Object stopDateKd;
/**
* 宽带本金余额
*/
private Double feeBjKd;
/**
* 201812月是否活跃
*/
private String isHy1812;
/**
* 201901月是否活跃
*/
private String isHy1901;
/**
* 201902月是否活跃
*/
private String isHy1902;
/**
* 维系策略
*/
private String wxcl;
/**
* 用户可理解的手机套餐名称
*/
private String cdmaDiscDescYh;
/**
* 用户可理解的宽带套餐名称
*/
private String kdDiscNameYh;
/**
* 对用户显示套餐内容
*/
private String showDiscDesc;
/**
* 推荐用户办理的套餐内容
*/
private String recDiscDesc;
/**
* 推荐用户办理的套餐详情
*/
private String recDiscXq;
/**
* 用户确认页提示内容
*/
private String promptDec;
public Integer getMonthId() {
return monthId;
}
public void setMonthId(Integer monthId) {
this.monthId = monthId;
}
public Double getServId() {
return servId;
}
public void setServId(Double servId) {
this.servId = servId;
}
public String getSubstName() {
return substName;
}
public void setSubstName(String substName) {
this.substName = substName;
}
public String getSchoolName() {
return schoolName;
}
public void setSchoolName(String schoolName) {
this.schoolName = schoolName;
}
public String getUserType() {
return userType;
}
public void setUserType(String userType) {
this.userType = userType;
}
public String getIsPreTs() {
return isPreTs;
}
public void setIsPreTs(String isPreTs) {
this.isPreTs = isPreTs;
}
public String getCustName() {
return custName;
}
public void setCustName(String custName) {
this.custName = custName;
}
public String getSocialId() {
return socialId;
}
public void setSocialId(String socialId) {
this.socialId = socialId;
}
public String getAccNbr() {
return accNbr;
}
public void setAccNbr(String accNbr) {
this.accNbr = accNbr;
}
public Object getFinishDate() {
return finishDate;
}
public void setFinishDate(Object finishDate) {
this.finishDate = finishDate;
}
public Double getRwDate() {
return rwDate;
}
public void setRwDate(Double rwDate) {
this.rwDate = rwDate;
}
public String getCdmaDiscDesc() {
return cdmaDiscDesc;
}
public void setCdmaDiscDesc(String cdmaDiscDesc) {
this.cdmaDiscDesc = cdmaDiscDesc;
}
public String getIsBltc1() {
return isBltc1;
}
public void setIsBltc1(String isBltc1) {
this.isBltc1 = isBltc1;
}
public String getIsBltc2() {
return isBltc2;
}
public void setIsBltc2(String isBltc2) {
this.isBltc2 = isBltc2;
}
public String getIsBltc3() {
return isBltc3;
}
public void setIsBltc3(String isBltc3) {
this.isBltc3 = isBltc3;
}
public String getStateDesc() {
return stateDesc;
}
public void setStateDesc(String stateDesc) {
this.stateDesc = stateDesc;
}
public String getStopDate() {
return stopDate;
}
public void setStopDate(String stopDate) {
this.stopDate = stopDate;
}
public String getIsGlkd() {
return isGlkd;
}
public void setIsGlkd(String isGlkd) {
this.isGlkd = isGlkd;
}
public Double getFeeT3() {
return feeT3;
}
public void setFeeT3(Double feeT3) {
this.feeT3 = feeT3;
}
public Double getFeeT2() {
return feeT2;
}
public void setFeeT2(Double feeT2) {
this.feeT2 = feeT2;
}
public Double getFeeT1() {
return feeT1;
}
public void setFeeT1(Double feeT1) {
this.feeT1 = feeT1;
}
public Double getAvgFee() {
return avgFee;
}
public void setAvgFee(Double avgFee) {
this.avgFee = avgFee;
}
public String getChannelNbr() {
return channelNbr;
}
public void setChannelNbr(String channelNbr) {
this.channelNbr = channelNbr;
}
public String getChannelName() {
return channelName;
}
public void setChannelName(String channelName) {
this.channelName = channelName;
}
public String getDlsName() {
return dlsName;
}
public void setDlsName(String dlsName) {
this.dlsName = dlsName;
}
public Double getFeeBj() {
return feeBj;
}
public void setFeeBj(Double feeBj) {
this.feeBj = feeBj;
}
public String getIsHyt1() {
return isHyt1;
}
public void setIsHyt1(String isHyt1) {
this.isHyt1 = isHyt1;
}
public String getIsYxt1() {
return isYxt1;
}
public void setIsYxt1(String isYxt1) {
this.isYxt1 = isYxt1;
}
public Integer getKjTsT1() {
return kjTsT1;
}
public void setKjTsT1(Integer kjTsT1) {
this.kjTsT1 = kjTsT1;
}
public Double getStmDataT1() {
return stmDataT1;
}
public void setStmDataT1(Double stmDataT1) {
this.stmDataT1 = stmDataT1;
}
public Double getMouCallT1() {
return mouCallT1;
}
public void setMouCallT1(Double mouCallT1) {
this.mouCallT1 = mouCallT1;
}
public Integer getMgsCountsT1() {
return mgsCountsT1;
}
public void setMgsCountsT1(Integer mgsCountsT1) {
this.mgsCountsT1 = mgsCountsT1;
}
public String getIsBltc4() {
return isBltc4;
}
public void setIsBltc4(String isBltc4) {
this.isBltc4 = isBltc4;
}
public Integer getBltcNum() {
return bltcNum;
}
public void setBltcNum(Integer bltcNum) {
this.bltcNum = bltcNum;
}
public String getAccNbrKd() {
return accNbrKd;
}
public void setAccNbrKd(String accNbrKd) {
this.accNbrKd = accNbrKd;
}
public String getAccNbr2() {
return accNbr2;
}
public void setAccNbr2(String accNbr2) {
this.accNbr2 = accNbr2;
}
public String getYuName() {
return yuName;
}
public void setYuName(String yuName) {
this.yuName = yuName;
}
public Object getCreateDateKd() {
return createDateKd;
}
public void setCreateDateKd(Object createDateKd) {
this.createDateKd = createDateKd;
}
public String getIsHyKd() {
return isHyKd;
}
public void setIsHyKd(String isHyKd) {
this.isHyKd = isHyKd;
}
public Double getRwDateKd() {
return rwDateKd;
}
public void setRwDateKd(Double rwDateKd) {
this.rwDateKd = rwDateKd;
}
public String getKdDiscName() {
return kdDiscName;
}
public void setKdDiscName(String kdDiscName) {
this.kdDiscName = kdDiscName;
}
public String getIs0ykd() {
return is0ykd;
}
public void setIs0ykd(String is0ykd) {
this.is0ykd = is0ykd;
}
public Integer getSpeedValue() {
return speedValue;
}
public void setSpeedValue(Integer speedValue) {
this.speedValue = speedValue;
}
public Integer getSpeedTyValue() {
return speedTyValue;
}
public void setSpeedTyValue(Integer speedTyValue) {
this.speedTyValue = speedTyValue;
}
public Integer getSpeedKd() {
return speedKd;
}
public void setSpeedKd(Integer speedKd) {
this.speedKd = speedKd;
}
public String getKdStateDesc() {
return kdStateDesc;
}
public void setKdStateDesc(String kdStateDesc) {
this.kdStateDesc = kdStateDesc;
}
public Object getStopDateKd() {
return stopDateKd;
}
public void setStopDateKd(Object stopDateKd) {
this.stopDateKd = stopDateKd;
}
public Double getFeeBjKd() {
return feeBjKd;
}
public void setFeeBjKd(Double feeBjKd) {
this.feeBjKd = feeBjKd;
}
public String getIsHy1812() {
return isHy1812;
}
public void setIsHy1812(String isHy1812) {
this.isHy1812 = isHy1812;
}
public String getIsHy1901() {
return isHy1901;
}
public void setIsHy1901(String isHy1901) {
this.isHy1901 = isHy1901;
}
public String getIsHy1902() {
return isHy1902;
}
public void setIsHy1902(String isHy1902) {
this.isHy1902 = isHy1902;
}
public String getWxcl() {
return wxcl;
}
public void setWxcl(String wxcl) {
this.wxcl = wxcl;
}
public String getCdmaDiscDescYh() {
return cdmaDiscDescYh;
}
public void setCdmaDiscDescYh(String cdmaDiscDescYh) {
this.cdmaDiscDescYh = cdmaDiscDescYh;
}
public String getKdDiscNameYh() {
return kdDiscNameYh;
}
public void setKdDiscNameYh(String kdDiscNameYh) {
this.kdDiscNameYh = kdDiscNameYh;
}
public String getShowDiscDesc() {
return showDiscDesc;
}
public void setShowDiscDesc(String showDiscDesc) {
this.showDiscDesc = showDiscDesc;
}
public String getRecDiscDesc() {
return recDiscDesc;
}
public void setRecDiscDesc(String recDiscDesc) {
this.recDiscDesc = recDiscDesc;
}
public String getRecDiscXq() {
return recDiscXq;
}
public void setRecDiscXq(String recDiscXq) {
this.recDiscXq = recDiscXq;
}
public String getPromptDec() {
return promptDec;
}
public void setPromptDec(String promptDec) {
this.promptDec = promptDec;
}
}
\ No newline at end of file
common/src/main/java/com/winsun/bean/Partner.java
...@@ -12,7 +12,7 @@ import java.io.Serializable; ...@@ -12,7 +12,7 @@ import java.io.Serializable;
*合伙人信息 *合伙人信息
*/ */
@Data @Data
@TableName("hhr_user") @TableName("hhr_user_view")
public class Partner implements Serializable { public class Partner implements Serializable {
/** /**
...@@ -57,7 +57,6 @@ public class Partner implements Serializable { ...@@ -57,7 +57,6 @@ public class Partner implements Serializable {
* 性别 * 性别
*/ */
private String gender; private String gender;
/** /**
* 县分（区域） * 县分（区域）
*/ */
......
common/src/main/java/com/winsun/bean/Product.java
...@@ -68,7 +68,7 @@ public class Product implements Serializable { ...@@ -68,7 +68,7 @@ public class Product implements Serializable {
private String productIntroduction; private String productIntroduction;
/** /**
* 状态0正常，1删除 * 状态0正常，1下架
*/ */
private String productState = "0"; private String productState = "0";
......
common/src/main/java/com/winsun/bean/YsmUser.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
/**
* 学校信息
*/
@Data
@TableName("hhr_ysm_user")
public class YsmUser implements Serializable {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private int id;
/**
*预实名账号
*/
private String userName;
/**
* 签名
*/
private String sign;
/**
* 是否佣金1是0否
*/
private int status = 1;
}
common/src/main/java/com/winsun/constant/OrderStatus.java
...@@ -12,11 +12,14 @@ import java.util.Map; ...@@ -12,11 +12,14 @@ import java.util.Map;
public enum OrderStatus { public enum OrderStatus {
// //
PENDINGSUBMISSION("1", "待提交"), PENDINGSUBMISSION("1", "待提交"),
FILE("4", "归档"), FILE("4", "已完成"),
INVALID("5", "作废"), INVALID("5", "异常单"),
ACCEPTANCESUCCESSFUL("3", "受理成功"), PENDINGDISTRIBUTION("6", "待配送"),
INLOGISTICSDISTRIBUTION("7", "已完成"),
SUCCESSFULDISTRIBUTION("8", "已完成"),
ACCEPTANCESUCCESSFUL("3", "已完成"),
CHARGED("9", "已收费"), CHARGED("9", "已收费"),
ACCEPTEXCEPTCION("10", "受理异常"), ACCEPTEXCEPTCION("10", "异常单"),
PENDINGACCEPTANCE("2", "待受理"), PENDINGACCEPTANCE("2", "待受理"),
NOTPAID("100", "未支付"); NOTPAID("100", "未支付");
OrderStatus(String id, String name) { OrderStatus(String id, String name) {
......
common/src/main/java/com/winsun/mapper/OrderViewMapper.java
...@@ -3,11 +3,10 @@ package com.winsun.mapper; ...@@ -3,11 +3,10 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.OrderView; import com.winsun.bean.OrderView;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.sql.Timestamp;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -21,4 +20,17 @@ public interface OrderViewMapper extends BaseMapper<OrderView> { ...@@ -21,4 +20,17 @@ public interface OrderViewMapper extends BaseMapper<OrderView> {
@Select("<script>SELECT * FROM `order_view` <where> ${ew.sqlSegment} </where> </script>") @Select("<script>SELECT * FROM `order_view` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String, Object>> downloadOrderView(@Param("ew") Wrapper<OrderView> wrapper); List<Map<String, Object>> downloadOrderView(@Param("ew") Wrapper<OrderView> wrapper);
/**
* 智能平台推送接收
* @return
*/
@Update("<script>UPDATE `hhr_order` set th_status = #{status},order_status = #{orderStatus} <where> ${ew.sqlSegment} </where> </script>")
Integer IntelligentPlatformPush(@Param("ew") Wrapper<Object> wrapper,@Param("status")String status,@Param("orderStatus")String orderStatus);
@Select("<script>SELECT id FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
String selectOrderId(@Param("ew") Wrapper<Object> wrapper);
@Insert("insert into`hhr_order_history`(order_id, status, create_date) values(#{id}, #{status}, #{createTime})")
int insertOrderHistory(@Param("id")String id,@Param("status")String status,@Param("createTime") Timestamp createTime);
} }
common/src/main/java/com/winsun/mapper/PackageMapper.java
...@@ -5,11 +5,16 @@ import com.winsun.bean.Package; ...@@ -5,11 +5,16 @@ import com.winsun.bean.Package;
import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper @Mapper
@Component @Component
public interface PackageMapper extends BaseMapper<Package> { public interface PackageMapper extends BaseMapper<Package> {
@Select("SELECT cdma_disc_desc as cdmaDiscDesc FROM hhr_xyzx_yd_yrym_list GROUP BY cdma_disc_desc")
List<Map<String,Object>> packageAll();
} }
common/src/main/java/com/winsun/mapper/PartnerMapper.java
...@@ -3,9 +3,18 @@ package com.winsun.mapper; ...@@ -3,9 +3,18 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Partner; import com.winsun.bean.Partner;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Mapper @Mapper
@Component @Component
public interface PartnerMapper extends BaseMapper<Partner> { public interface PartnerMapper extends BaseMapper<Partner> {
@Update("update sys_user set phone = #{phone} ,name = #{name} ,account = #{account} ,sex = #{gender} ,substName = #{area} where id=#{id}")
int updateSysUser(@Param("phone") String phone,@Param("name") String name,@Param("account") String account,@Param("gender") String gender,@Param("area") String area,@Param("id") String id);
@Update("update hhr_user set ysm = #{ysm} ,wx_id = #{wxId} ,id_card = #{idCard} ,school = #{school} where id=#{id}")
int updateHhUser(@Param("ysm") String ysm,@Param("wxId") String wxId,@Param("idCard") String idCard,@Param("school") String school,@Param("id") String id);
} }
common/src/main/java/com/winsun/mapper/YsmUserMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.YsmUser;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface YsmUserMapper extends BaseMapper<YsmUser> {
}
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java 0 → 100644
package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.OrderView;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.OrderViewMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
* @Author: chancy
* @Date: 2020/2/21 9:22
*/
@Slf4j
@RestController
@RequestMapping("/school_center")
public class IntelligentPlatformPushController {
private static OrderViewMapper orderViewMapper;
@Autowired
public IntelligentPlatformPushController(OrderViewMapper orderViewMapper) {
IntelligentPlatformPushController.orderViewMapper = orderViewMapper;
}
/**
* 智能平台推送信息接收
*
* @param sign
* @param type
* @param content
* @return dataType：
* 预付费 yff
* 单宽带 dkd
* 融合 rh
*/
@RequestMapping(value = "/IntelligentPlatformPush/{dataType}/IntelligentPlatform")
@ResponseBody
public Map<String, Object> IntelligentPlatform(String sign, String type, String content) {
Map<String, Object> signMap = (Map<String, Object>) JSON.parse(content);
Map<String, Object> resultMap = new HashMap<>();
if (StringUtils.isEmpty(type)) {
log.info("业务类型不能为空---" + type + "---" + sign + "----" + content);
resultMap.put("code", "12001");
resultMap.put("msg", "业务类型不能为空");
return resultMap;
}
if (StringUtils.isEmpty(sign)) {
log.info("sign不能为空---" + type + "---" + sign + "----" + content);
resultMap.put("code", "12001");
resultMap.put("msg", "sign不能为空");
return resultMap;
}
if (signMap.get("orderNum") != null && StringUtils.isNotBlank(signMap.get("orderNum").toString())) {
Wrapper<Object> wrapper = new EntityWrapper<>();
wrapper.eq("order_id", signMap.get("orderNum"));
String status = signMap.get("status").toString();
String orderStatus = null;
try {
orderStatus = OrderStatus.findById(signMap.get("statusId").toString()).getName();
} catch (Exception e) {
resultMap.put("code", "12001");
resultMap.put("msg", "订单状态不存在");
log.error(e.getMessage(), e);
return resultMap;
}
Integer num = orderViewMapper.IntelligentPlatformPush(wrapper, status, orderStatus);
if (num > 0) {
if (type.equals("dkd") || type.equals("rh")) {
Wrapper<OrderView> wrapper1 = new EntityWrapper<>();
wrapper1.eq("orderSeqTHD", signMap.get("orderNum"));
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("status", signMap.get("statusId"));
try {
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
log.info("更新成功！！！");
resultMap.put("code", "000001");
resultMap.put("msg", "消息接收成功");
} else {
log.info("更新失败");
resultMap.put("code", "00001");
resultMap.put("msg", "消息接收成功更新失败");
}
String id = orderViewMapper.selectOrderId(wrapper);
Date date = new Date();
Timestamp createTime = new Timestamp(date.getTime());
try {
orderViewMapper.insertOrderHistory(id, status, createTime);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
return resultMap;
} else {
log.info("更新失败");
resultMap.put("code", "12001");
resultMap.put("msg", "智能平台订单号不能为空");
}
return resultMap;
}
}
service-manager/src/main/java/com/winsun/controller/OrderViewController.java
...@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData; ...@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.OrderView; import com.winsun.bean.OrderView;
import com.winsun.bean.UniversityInfo;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.mapper.OrderViewMapper; import com.winsun.mapper.OrderViewMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -45,7 +44,18 @@ public class OrderViewController extends BaseController { ...@@ -45,7 +44,18 @@ public class OrderViewController extends BaseController {
OrderViewController.orderViewMapper = orderViewMapper; OrderViewController.orderViewMapper = orderViewMapper;
} }
/**
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param orderseq 订单号码
* @param orderUniversityName 学校
* @param status 状态
* @param ordername 姓名
* @param pageIndex
* @param pageSize
* @return
*/
@Permission(menuname = "查询宽带订单（列表）", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询宽带订单（列表）", value = "list", method = RequestMethod.POST)
public ResponseData<Page<OrderView>> listOrderView(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, public ResponseData<Page<OrderView>> listOrderView(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime,
@RequestParam("orderseq") String orderseq, @RequestParam("orderUniversityName") String orderUniversityName, @RequestParam("orderseq") String orderseq, @RequestParam("orderUniversityName") String orderUniversityName,
...@@ -77,7 +87,7 @@ public class OrderViewController extends BaseController { ...@@ -77,7 +87,7 @@ public class OrderViewController extends BaseController {
Page<OrderView> page = new Page<>(pageIndex, pageSize); Page<OrderView> page = new Page<>(pageIndex, pageSize);
List<OrderView> OrderViews = orderViewMapper.selectPage(page, wrapper); List<OrderView> OrderViews = orderViewMapper.selectPage(page, wrapper);
page.setRecords(OrderViews); page.setRecords(OrderViews);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询成功！");
} }
@Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST) @Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
...@@ -156,6 +166,7 @@ public class OrderViewController extends BaseController { ...@@ -156,6 +166,7 @@ public class OrderViewController extends BaseController {
sheet.setColumnWidth(2, 6500); sheet.setColumnWidth(2, 6500);
sheet.setColumnWidth(5, 7000); sheet.setColumnWidth(5, 7000);
sheet.setColumnWidth(8, 4000); sheet.setColumnWidth(8, 4000);
sheet.setColumnWidth(10, 6500);
sheet.setColumnWidth(11, 6500); sheet.setColumnWidth(11, 6500);
sheet.setColumnWidth(14, 6500); sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 7000); sheet.setColumnWidth(15, 7000);
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
...@@ -10,6 +10,7 @@ import com.winsun.auth.core.base.controller.BaseController; ...@@ -10,6 +10,7 @@ import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.SchoolPackage;
import com.winsun.mapper.PackageMapper; import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.SchoolPackageMapper; import com.winsun.mapper.SchoolPackageMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
...@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -31,7 +33,7 @@ import java.util.Map; ...@@ -31,7 +33,7 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/school/package") @RequestMapping("/packageManagement/package")
public class PackageController extends BaseController { public class PackageController extends BaseController {
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
...@@ -44,65 +46,125 @@ public class PackageController extends BaseController { ...@@ -44,65 +46,125 @@ public class PackageController extends BaseController {
PackageController.schoolPackageMapper = schoolPackageMapper; PackageController.schoolPackageMapper = schoolPackageMapper;
} }
/**
*
* @param id
* @param packageName
* @param name
* @param isXbCard
* @param monthFee
* @param flow
* @param voice
* @param xbId
* @param warmTip
* @param explains
* @return
*/
@Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST) @Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPackage(@RequestParam("package") String pack) { public ResponseData<String> insertPackage(@RequestParam("id") String id,@RequestParam("packageName") String packageName, @RequestParam("name") String name, @RequestParam("isXbCard") int isXbCard
ShiroUser user = getShiroUser(); , @RequestParam("monthFee") String monthFee, @RequestParam("flow") String flow, @RequestParam("voice") String voice
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { , @RequestParam("xbId") String xbId, @RequestParam("warmTip") String warmTip, @RequestParam("explains") String explains) {
return ResponseData.error("无数据权限"); Package aPackage = new Package();
aPackage.setPackageName(packageName);
aPackage.setName(name);
aPackage.setIsXbCard(isXbCard);
aPackage.setMonthFee(monthFee);
aPackage.setFlow(flow);
aPackage.setVoice(voice);
aPackage.setXbId(xbId);
aPackage.setWarmTip(warmTip);
aPackage.setExplains(explains);
Integer insert = packageMapper.insert(aPackage);
if (insert==1){
log.info("套餐信息新增完毕,id: {}",aPackage.getId());
return ResponseData.success("新增完毕！");
} }
Package aPackage = JSON.parseObject(pack, Package.class); log.info("套餐信息新增失败,id: {}",aPackage.getId());
packageMapper.insert(aPackage); return ResponseData.success("新增失败！");
return ResponseData.success("添加完毕！");
} }
/**
*
* @param id
* @return
*/
@Permission(menuname = "删除套餐信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除套餐信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deletePackage(@RequestParam("id") String id) { public ResponseData<String> deletePackage(@RequestParam("id") int id) {
ShiroUser user = getShiroUser(); Integer integer = packageMapper.deleteById(id);
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
packageMapper.deleteById(id);
//删除中间表信息 //删除中间表信息
schoolPackageMapper.deleteIntermediateTableByPackage(id); EntityWrapper<SchoolPackage> schoolPackagewrapper = new EntityWrapper<>();
return ResponseData.success("删除完毕！"); schoolPackagewrapper.eq("package_id",id);
schoolPackageMapper.delete(schoolPackagewrapper);
if (integer==1){
log.info("套餐信息删除完毕,删除id: {}",id);
return ResponseData.success("删除完毕！");
}
log.info("套餐信息删除失败,删除id: {}",id);
return ResponseData.success("删除失败！");
} }
/**
*
* @param id
* @param packageName
* @param name
* @param isXbCard
* @param monthFee
* @param flow
* @param voice
* @param xbId
* @param warmTip
* @param explains
* @return
*/
@Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePackage(@RequestParam("package") String pack) { public ResponseData<String> updatePackage(@RequestParam("id") String id,@RequestParam("packageName") String packageName, @RequestParam("name") String name, @RequestParam("isXbCard") String isXbCard
ShiroUser user = getShiroUser(); , @RequestParam("monthFee") String monthFee, @RequestParam("flow") String flow, @RequestParam("voice") String voice
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { , @RequestParam("xbId") String xbId, @RequestParam("warmTip") String warmTip, @RequestParam("explains") String explains) {
return ResponseData.error("无数据权限");
}
Package aPackage = JSON.parseObject(pack, Package.class);
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", aPackage.getId()); wrapper.eq("id", id);
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("name", ""); dataMapping.put("package_name", packageName);
packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); dataMapping.put("name", name);
return ResponseData.success("修改完毕！"); dataMapping.put("is_xb_card", isXbCard);
dataMapping.put("month_fee", monthFee);
dataMapping.put("flow", flow);
dataMapping.put("voice", voice);
dataMapping.put("xb_id", xbId);
dataMapping.put("warm_tip", warmTip);
dataMapping.put("explains", explains);
Integer integer = packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if (integer==1){
log.info("成功修改完毕套餐信息");
return ResponseData.success("修改完毕！");
}else{
log.info("修改失败套餐信息");
return ResponseData.error("修改失败！");
}
} }
@Permission(menuname = "查询套餐信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询套餐信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name, @RequestParam("type") String type, public ResponseData<Page<Package>> listPackage(@RequestParam("name") String name, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam("packageName") String packageName, @RequestParam("status") String status,
@RequestParam("isXbCard") String isXbCard, @RequestParam(name = "pageIndex", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) { @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Package> wrapper = new EntityWrapper(); Wrapper<Package> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(name), "package_name", name, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(type), "type", Integer.parseInt(type));
wrapper.eq(StringUtils.isNotBlank(status), "status", status);
wrapper.like(StringUtils.isNotBlank(packageName), "package_name", packageName, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(isXbCard), "is_xb_card", Integer.parseInt(isXbCard));
Page<Package> page = new Page<>(pageIndex, pageSize); Page<Package> page = new Page<>(pageIndex, pageSize);
List<Package> aPackage = packageMapper.selectPage(page, wrapper); List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage); page.setRecords(aPackage);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
} }
@Permission(menuname = "套餐全称列表", value = "packageAllList", method = RequestMethod.POST)
public ResponseData<List<String>>packageAll() {
ArrayList<String> arrayList = new ArrayList<>();
final List<Map<String, Object>> maps = packageMapper.packageAll();
for (Map<String, Object> map : maps) {
if (map!=null){
arrayList.add(map.get("cdmaDiscDesc").toString());
}
}
return ResponseData.success(arrayList, "查询完毕！");
}
} }
service-manager/src/main/java/com/winsun/controller/PartnerController.java
...@@ -35,69 +35,31 @@ public class PartnerController extends BaseController { ...@@ -35,69 +35,31 @@ public class PartnerController extends BaseController {
private static PartnerMapper partnerMapper; private static PartnerMapper partnerMapper;
@Autowired @Autowired
public PartnerController(PartnerMapper partnerMapper) { public PartnerController(PartnerMapper partnerMapper) {
PartnerController.partnerMapper = partnerMapper; PartnerController.partnerMapper = partnerMapper;
} }
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Partner sale = JSON.parseObject(partner, Partner.class);
partnerMapper.insert(sale);
return ResponseData.success("添加完毕！");
}
@Permission(menuname = "删除合伙人信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deletePartner(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
partnerMapper.deleteById(id);
return ResponseData.success("删除完毕！");
}
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePartner(@RequestParam("partner") String partner) { public ResponseData<String> updatePartner(@RequestParam("id") String id,@RequestParam("phoneNum") String phoneNum, @RequestParam("school") String school
ShiroUser user = getShiroUser(); , @RequestParam("name") String name, @RequestParam("account") String account, @RequestParam("idCard") String idCard, @RequestParam("ysm") String ysm
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { , @RequestParam("gender") String gender, @RequestParam("area") String area, @RequestParam("wxId") String wxId) {
return ResponseData.error("无数据权限"); int updateSysUse = partnerMapper.updateSysUser(phoneNum, name, account, gender, area, id);
int updateHhUser = partnerMapper.updateHhUser(ysm,wxId,idCard,school,id);
if (updateSysUse==1&&updateHhUser==1){
return ResponseData.success("修改完毕！");
} }
Partner sale = JSON.parseObject(partner, Partner.class); return ResponseData.error("修改失败");
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId());
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("phoneNum", "");
partnerMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！");
} }
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Partner>> listPartner(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status, public ResponseData<Page<Partner>> listPartner(@RequestParam("school") String school, @RequestParam("name") String name, @RequestParam("area") String area,
@RequestParam("school") String school, @RequestParam("account") String account, @RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<Partner> wrapper = new EntityWrapper(); Wrapper<Partner> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(phoneNum), "phone_num", phoneNum, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(account), "account", account, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
wrapper.eq(StringUtils.isNotBlank(grade), "grade", grade);
wrapper.eq(StringUtils.isNotBlank(area), "area", area); wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Partner> page = new Page<>(pageIndex, pageSize); Page<Partner> page = new Page<>(pageIndex, pageSize);
List<Partner> salespeople = partnerMapper.selectPage(page, wrapper); List<Partner> salespeople = partnerMapper.selectPage(page, wrapper);
page.setRecords(salespeople); page.setRecords(salespeople);
......
service-manager/src/main/java/com/winsun/controller/ProductController.java
...@@ -57,7 +57,7 @@ public class ProductController extends BaseController { ...@@ -57,7 +57,7 @@ public class ProductController extends BaseController {
pro.setProductLastUpdateTime(timestamp); pro.setProductLastUpdateTime(timestamp);
pro.setProductCreater(user.getName()); pro.setProductCreater(user.getName());
productMapper.insert(pro); productMapper.insert(pro);
return ResponseData.success("添加完毕！"); return ResponseData.success("添加成功！");
} }
/** /**
...@@ -80,7 +80,7 @@ public class ProductController extends BaseController { ...@@ -80,7 +80,7 @@ public class ProductController extends BaseController {
dataMapping.put("product_last_update_time", timestamp); dataMapping.put("product_last_update_time", timestamp);
dataMapping.put("product_state", "1"); dataMapping.put("product_state", "1");
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除成功！");
} }
/** /**
...@@ -102,8 +102,6 @@ public class ProductController extends BaseController { ...@@ -102,8 +102,6 @@ public class ProductController extends BaseController {
Timestamp timestamp = new Timestamp(date.getTime()); Timestamp timestamp = new Timestamp(date.getTime());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("product_last_update_time", timestamp); dataMapping.put("product_last_update_time", timestamp);
dataMapping.put("product_introduction", pro.getProductIntroduction());
dataMapping.put("product_set_meal_introduction", pro.getProductSetMealIntroduction());
dataMapping.put("product_meal_price", pro.getProductMealPrice()); dataMapping.put("product_meal_price", pro.getProductMealPrice());
dataMapping.put("product_meal", pro.getProductMeal()); dataMapping.put("product_meal", pro.getProductMeal());
dataMapping.put("product_title", pro.getProductTitle()); dataMapping.put("product_title", pro.getProductTitle());
...@@ -111,8 +109,9 @@ public class ProductController extends BaseController { ...@@ -111,8 +109,9 @@ public class ProductController extends BaseController {
dataMapping.put("product_price", pro.getProductPrice()); dataMapping.put("product_price", pro.getProductPrice());
dataMapping.put("product_region", pro.getProductRegion()); dataMapping.put("product_region", pro.getProductRegion());
dataMapping.put("product_rate", pro.getProductRate()); dataMapping.put("product_rate", pro.getProductRate());
dataMapping.put("product_state", pro.getProductState());
productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); productMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改成功！");
} }
/** /**
...@@ -137,7 +136,7 @@ public class ProductController extends BaseController { ...@@ -137,7 +136,7 @@ public class ProductController extends BaseController {
Page<Product> page = new Page<>(pageNo, pageSize); Page<Product> page = new Page<>(pageNo, pageSize);
List<Product> products = productMapper.selectPage(page, wrapper); List<Product> products = productMapper.selectPage(page, wrapper);
page.setRecords(products); page.setRecords(products);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询成功！");
} }
/** /**
......
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
...@@ -99,16 +99,15 @@ public class SchoolManagementController extends BaseController { ...@@ -99,16 +99,15 @@ public class SchoolManagementController extends BaseController {
} }
@Permission(menuname = "删除學校信息", value = "delete", method = RequestMethod.POST) @Permission(menuname = "删除學校信息", value = "hidestatus", method = RequestMethod.POST)
public ResponseData<String> deleteSchool(@RequestParam("id") String id) { public ResponseData<String> deleteSchool(@RequestParam("id") String id,@RequestParam("status") int status) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) { Integer integer = schoolMapper.updateForSet("status=" + status, new EntityWrapper<School>().eq("id", id));
return ResponseData.error("无数据权限"); if (integer==1){
return ResponseData.success("修改成功！");
} }
schoolMapper.deleteById(id); return ResponseData.error("修改失败");
//删除中间表信息
schoolPackageMapper.deleteIntermediateTableBySchool(id);
return ResponseData.success("删除完毕！");
} }
/** /**
...@@ -143,7 +142,7 @@ public class SchoolManagementController extends BaseController { ...@@ -143,7 +142,7 @@ public class SchoolManagementController extends BaseController {
dataMapping.put("is_showband", isShowband); dataMapping.put("is_showband", isShowband);
dataMapping.put("is_showrh", isShowrh); dataMapping.put("is_showrh", isShowrh);
schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
//插入学校与套餐中间表数据
if (StringUtils.isNotBlank(chosePages)){ if (StringUtils.isNotBlank(chosePages)){
String[] split = chosePages.split(","); String[] split = chosePages.split(",");
if (split.length<=0) { if (split.length<=0) {
...@@ -185,19 +184,19 @@ public class SchoolManagementController extends BaseController { ...@@ -185,19 +184,19 @@ public class SchoolManagementController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(status), "status", status); wrapper.eq(StringUtils.isNotBlank(status), "status", status);
Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize); Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper); List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
//查询县分列表
Wrapper<School> wrapperSubName = new EntityWrapper(); Wrapper<School> wrapperSubName = new EntityWrapper();
wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name"); wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");
List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName); List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName);
EntityWrapper<Package> packagewrapper = new EntityWrapper<>(); EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.setSqlSelect("id,package_name as packageName"); packagewrapper.setSqlSelect("id,package_name as packageName");
List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper); List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
//查询单宽学校名称
Wrapper<Product> productwrapper = new EntityWrapper(); Wrapper<Product> productwrapper = new EntityWrapper();
productwrapper.setSqlSelect("product_id as productId,product_university as ProductUniversity"); productwrapper.setSqlSelect("product_id as productId,product_university as ProductUniversity");
productwrapper.eq("product_state", "0"); productwrapper.eq("product_state", "0");
List<Map<String, Object>> products = productMapper.selectMaps(productwrapper); List<Map<String, Object>> products = productMapper.selectMaps(productwrapper);
//存放县分下拉列表和单宽学校名称下拉列表
if (!CollectionUtils.isEmpty(maps)){ if (!CollectionUtils.isEmpty(maps)){
maps.get(0).put("subNameList",selectMaps); maps.get(0).put("subNameList",selectMaps);
maps.get(0).put("packageName",packageselectMaps); maps.get(0).put("packageName",packageselectMaps);
......
service-manager/src/main/java/com/winsun/controller/UniversityInfoController.java
...@@ -60,7 +60,7 @@ public class UniversityInfoController extends BaseController { ...@@ -60,7 +60,7 @@ public class UniversityInfoController extends BaseController {
uni.setUniversityLastUpdateTime(timestamp); uni.setUniversityLastUpdateTime(timestamp);
uni.setUniversityCreater(user.getName()); uni.setUniversityCreater(user.getName());
universityInfoMapper.insert(uni); universityInfoMapper.insert(uni);
return ResponseData.success("添加完毕！"); return ResponseData.success("添加成功！");
} }
/** /**
...@@ -75,7 +75,7 @@ public class UniversityInfoController extends BaseController { ...@@ -75,7 +75,7 @@ public class UniversityInfoController extends BaseController {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
universityInfoMapper.deleteById(id); universityInfoMapper.deleteById(id);
return ResponseData.success("删除完毕！"); return ResponseData.success("删除成功！");
} }
/** /**
...@@ -109,7 +109,7 @@ public class UniversityInfoController extends BaseController { ...@@ -109,7 +109,7 @@ public class UniversityInfoController extends BaseController {
dataMapping.put("speed", uni.getSpeed()); dataMapping.put("speed", uni.getSpeed());
dataMapping.put("public_number", uni.getPublicNumber()); dataMapping.put("public_number", uni.getPublicNumber());
universityInfoMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); universityInfoMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！"); return ResponseData.success("修改成功！");
} }
/** /**
...@@ -133,6 +133,6 @@ public class UniversityInfoController extends BaseController { ...@@ -133,6 +133,6 @@ public class UniversityInfoController extends BaseController {
Page<UniversityInfo> page = new Page<>(pageIndex, pageSize); Page<UniversityInfo> page = new Page<>(pageIndex, pageSize);
List<UniversityInfo> universitys = universityInfoMapper.selectPage(page, wrapper); List<UniversityInfo> universitys = universityInfoMapper.selectPage(page, wrapper);
page.setRecords(universitys); page.setRecords(universitys);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询成功！");
} }
} }
service-manager/src/main/java/com/winsun/controller/YsmUserController.java 0 → 100644
package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.UniversityInfo;
import com.winsun.bean.YsmUser;
import com.winsun.mapper.UniversityInfoMapper;
import com.winsun.mapper.YsmUserMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 智能平台账号实名管理
* @Author: chancy
* @Date:
*/
@Slf4j
@RestController
@RequestMapping("/ysmUser")
public class YsmUserController extends BaseController {
private static YsmUserMapper ysmUserMapper;
@Autowired
public YsmUserController(YsmUserMapper ysmUserMapper) {
YsmUserController.ysmUserMapper = ysmUserMapper;
}
/**
* 添加实名智能平台账号
* @param ysmUser 添加对象的json字符串
* @return
*/
@Permission(menuname = "添加实名账号", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertYsmUser(@RequestParam("ysmUser") String ysmUser) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
YsmUser ysm = JSON.parseObject(ysmUser, YsmUser.class);
ysmUserMapper.insert(ysm);
return ResponseData.success("添加成功！");
}
/**
* 不通过佣金系统
* @param id 不通过佣金系统账号的ID
* @return
*/
@Permission(menuname = "不通过佣金系统", value = "notThrough/{id}", method = RequestMethod.POST)
public ResponseData<String> notThroughYsmUser(@PathVariable("id") Integer id,@RequestParam("status") Integer status) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", id);
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("status", status);
ysmUserMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改成功！");
}
/**
* 编辑实名智能平台账号
* @param ysmUser 编辑对象的json字符串
* @return
*/
@Permission(menuname = "编辑实名智能平台账号", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateYsmUser(@RequestParam("ysmUser") String ysmUser) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
YsmUser ysm = JSON.parseObject(ysmUser, YsmUser.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id",ysm.getId());
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("user_name", ysm.getUserName());
dataMapping.put("sign", ysm.getSign());
ysmUserMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改成功！");
}
/**
*查询实名智能平台账号
* @param userName 实名账号
* @param pageIndex
* @param pageSize
* @return
*/
@Permission(menuname = "查询实名智能平台账号", value = "list", method = RequestMethod.POST)
public ResponseData<Page<YsmUser>> listYsmUser(@RequestParam("userName") String userName,
@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Wrapper<YsmUser> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(userName), "user_name", userName, SqlLike.DEFAULT);
Page<YsmUser> page = new Page<>(pageIndex, pageSize);
List<YsmUser> ysmUsers = ysmUserMapper.selectPage(page, wrapper);
page.setRecords(ysmUsers);
return ResponseData.success(page, "查询成功！");
}
@Permission(menuname = "查询", value = "getlist", method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> getlistYsmUser() {
Wrapper<YsmUser> wrapper = new EntityWrapper();
wrapper.setSqlSelect("id,user_name as userName");
return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功！");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment