Skip to content

G
gdtel-gztel-school-center
Commit e9ec88d8 by 陈浩建
Options

添加存量升级清单

parent dd326000
Showing with 173 additions and 20 deletions
common/src/main/java/com/winsun/bean/PackageUpgrade.java
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.enums.IdType; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* (PackageUpgrade)实体类 * (PackageUpgrade)实体类
...@@ -25,7 +26,7 @@ public class PackageUpgrade implements Serializable { ...@@ -25,7 +26,7 @@ public class PackageUpgrade implements Serializable {
/** /**
* 主键标识 * 主键标识
*/ */
@TableId(value = "serv_id", type = IdType.AUTO) @TableId(value = "serv_id")
private Double servId; private Double servId;
/** /**
* 局向 * 局向
...@@ -58,7 +59,7 @@ public class PackageUpgrade implements Serializable { ...@@ -58,7 +59,7 @@ public class PackageUpgrade implements Serializable {
/** /**
* 入网时间 * 入网时间
*/ */
private Object finishDate; private Date finishDate;
/** /**
* 网龄 * 网龄
*/ */
...@@ -170,7 +171,7 @@ public class PackageUpgrade implements Serializable { ...@@ -170,7 +171,7 @@ public class PackageUpgrade implements Serializable {
/** /**
* 宽带入网时间 * 宽带入网时间
*/ */
private Object createDateKd; private Date createDateKd;
/** /**
* 宽带号码是否活跃(亚飞提供) * 宽带号码是否活跃(亚飞提供)
*/ */
...@@ -207,7 +208,7 @@ public class PackageUpgrade implements Serializable { ...@@ -207,7 +208,7 @@ public class PackageUpgrade implements Serializable {
/** /**
* 停机时间 * 停机时间
*/ */
private Object stopDateKd; private Date stopDateKd;
/** /**
* 宽带本金余额 * 宽带本金余额
*/ */
...@@ -253,4 +254,4 @@ public class PackageUpgrade implements Serializable { ...@@ -253,4 +254,4 @@ public class PackageUpgrade implements Serializable {
*/ */
private String promptDec; private String promptDec;
} }
\ No newline at end of file
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Package;
import com.winsun.bean.PackageUpgrade;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper
@Component
public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
}
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -1037,12 +1037,12 @@ public class IntelligenceSendOrder { ...@@ -1037,12 +1037,12 @@ public class IntelligenceSendOrder {
net.sf.json.JSONObject.fromObject(saleList.get(i)); net.sf.json.JSONObject.fromObject(saleList.get(i));
// 判断获取的全部产品与订单产品符合的拿取对应的ID // 判断获取的全部产品与订单产品符合的拿取对应的ID
if (itmeJson.getString("propertyName").indexOf("提速包") != -1) { if (itmeJson.getString("propertyName").indexOf("提速包") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
} else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) { } else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
...@@ -1568,12 +1568,12 @@ public class IntelligenceSendOrder { ...@@ -1568,12 +1568,12 @@ public class IntelligenceSendOrder {
net.sf.json.JSONObject itmeJson = net.sf.json.JSONObject.fromObject(saleList.get(i)); net.sf.json.JSONObject itmeJson = net.sf.json.JSONObject.fromObject(saleList.get(i));
// 判断获取的全部产品与订单产品符合的拿取对应的ID // 判断获取的全部产品与订单产品符合的拿取对应的ID
if (itmeJson.getString("propertyName").indexOf("提速包") != -1) { if (itmeJson.getString("propertyName").indexOf("提速包") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId = itmeJson.getString("saleId"); saleId = itmeJson.getString("saleId");
} }
} else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) { } else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId = itmeJson.getString("saleId"); saleId = itmeJson.getString("saleId");
} }
......
gateway/pom.xml
...@@ -48,10 +48,6 @@ ...@@ -48,10 +48,6 @@
<artifactId>jasypt-spring-boot</artifactId> <artifactId>jasypt-spring-boot</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.melloware</groupId>
<artifactId>jasypt</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
</dependency> </dependency>
......
gateway/src/main/java/com/winsun/framework/zuul/ZuulServiceApplication.java
package com.winsun.framework.zuul; package com.winsun.framework.zuul;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
...@@ -16,13 +17,15 @@ import org.springframework.web.filter.CorsFilter; ...@@ -16,13 +17,15 @@ import org.springframework.web.filter.CorsFilter;
@RefreshScope @RefreshScope
public class ZuulServiceApplication { public class ZuulServiceApplication {
@Value("${allowedOrigin.origin}")
private String origin = "*";
@Bean @Bean
public CorsFilter corsFilter() { public CorsFilter corsFilter() {
final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
final CorsConfiguration config = new CorsConfiguration(); final CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true); // 允许cookies跨域 config.setAllowCredentials(true); // 允许cookies跨域
// config.addAllowedOrigin("*");// 允许向该服务器提交请求的URI，*表示全部允许。。这里尽量限制来源域，比如http://xxxx:8080 ,以降低安全风险。。 config.addAllowedOrigin(origin);// 允许向该服务器提交请求的URI，*表示全部允许。。这里尽量限制来源域，比如http://xxxx:8080 ,以降低安全风险。。
config.addAllowedOrigin("https://dx.dianyuanjiangli.com");// 允许向该服务器提交请求的URI，*表示全部允许。。这里尽量限制来源域，比如http://xxxx:8080 ,以降低安全风险。。 // config.addAllowedOrigin("https://dx.dianyuanjiangli.com");// 允许向该服务器提交请求的URI，*表示全部允许。。这里尽量限制来源域，比如http://xxxx:8080 ,以降低安全风险。。
config.addAllowedHeader("*");// 允许访问的头信息,*表示全部 config.addAllowedHeader("*");// 允许访问的头信息,*表示全部
config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了 config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了
config.addAllowedMethod("*");// 允许提交请求的方法，*表示全部允许，也可以单独设置GET、PUT等 config.addAllowedMethod("*");// 允许提交请求的方法，*表示全部允许，也可以单独设置GET、PUT等
......
gateway/src/main/resources/application-prod.yml
...@@ -86,3 +86,7 @@ management: ...@@ -86,3 +86,7 @@ management:
jasypt: jasypt:
encryptor: encryptor:
password: schoolCenterErp password: schoolCenterErp
# 可信源配置
allowedOrigin:
origin: "https://dx.dianyuanjiangli.com"
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -3,6 +3,8 @@ package com.winsun.controller; ...@@ -3,6 +3,8 @@ package com.winsun.controller;
import com.baomidou.mybatisplus.enums.SqlLike; import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; 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.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Package; import com.winsun.bean.Package;
......
service-manager/src/main/java/com/winsun/controller/PackageUpgradeController.java 0 → 100644
package com.winsun.controller;
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.bean.Package;
import com.winsun.bean.PackageUpgrade;
import com.winsun.bean.Teacher;
import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.PackageUpgradeMapper;
import com.winsun.mapper.TeacherMapper;
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.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
/**
* @Author: chenhaojian
* @Date: 2021/6/29
*/
@RestController
@RequestMapping("/packageUpgrade")
public class PackageUpgradeController extends BaseController {
@Autowired
private PackageUpgradeMapper packageUpgradeMapper;
@Autowired
private PackageMapper packageMapper;
@Permission(menuname = "查询信息", value = "list", method = RequestMethod.POST)
public Map<String,Object> dataList(@RequestParam(name = "accNbr",required = false)String accNbr,
@RequestParam(name = "cdmaDiscDesc",required = false)String cdmaDiscDesc,
@RequestParam(name = "wxcl",required = false)String wxcl,
@RequestParam(name = "pageNo", required = false) int pageNo,
@RequestParam(name = "pageSize", required = false) int pageSize
){
Map<String,Object> map = new HashMap<>();
try {
String package1 = "";
String package2 = "";
if (StringUtils.isNotBlank(cdmaDiscDesc)){
package1 = packageMapper.selectById(cdmaDiscDesc).getPackageName();
}
if (StringUtils.isNotBlank(wxcl)){
package2 = packageMapper.selectById(wxcl).getPackageName();
}
Wrapper<PackageUpgrade> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("serv_id as servId,acc_nbr as accNbr,cdma_disc_desc as cdmaDiscDesc,wxcl");
wrapper.eq(StringUtils.isNotBlank(accNbr), "acc_nbr",accNbr);
wrapper.eq(StringUtils.isNotBlank(package1), "cdma_disc_desc",package1);
wrapper.eq(StringUtils.isNotBlank(package2), "wxcl",package2);
com.baomidou.mybatisplus.plugins.Page<PackageUpgrade> page = new Page<>(pageNo, pageSize);
List<PackageUpgrade> aPackage = packageUpgradeMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
map.put("page",ResponseData.success(page,"查询成功！"));
}catch (Exception e){
e.printStackTrace();
}
return map;
}
@RequestMapping(value = "addData",method = RequestMethod.POST)
public ResponseData<String> addData(@RequestParam(name = "accNbr") String accNbr,
@RequestParam(name = "cdmaDiscDesc") String cdmaDiscDesc,
@RequestParam(name = "wxcl") String wxcl){
Wrapper<PackageUpgrade> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(accNbr), "acc_nbr",accNbr);
packageUpgradeMapper.delete(wrapper);
PackageUpgrade packageUpgrade = new PackageUpgrade();
packageUpgrade.setServId(Double.valueOf(accNbr));
packageUpgrade.setAccNbr(accNbr);
Date date = new Date();
packageUpgrade.setCustName("测试");
packageUpgrade.setCreateDateKd(date);
packageUpgrade.setFinishDate(date);
packageUpgrade.setStopDateKd(date);
try {
String package1 = "";
String package2 = "";
if (StringUtils.isNotBlank(cdmaDiscDesc)){
package1 = packageMapper.selectById(cdmaDiscDesc).getPackageName();
}
if (StringUtils.isNotBlank(wxcl)){
package2 = packageMapper.selectById(wxcl).getPackageName();
}
packageUpgrade.setCdmaDiscDesc(package1);
packageUpgrade.setWxcl(package2);
packageUpgradeMapper.insert(packageUpgrade);
}catch (Exception e){
e.printStackTrace();
}
return ResponseData.success();
}
@RequestMapping(value = "deleteData",method = RequestMethod.POST)
public ResponseData<String> deleteData(@RequestParam(name = "accNbr") String accNbr){
if(StringUtils.isBlank(accNbr)){
return ResponseData.error("");
};
Wrapper<PackageUpgrade> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(accNbr), "acc_nbr",accNbr);
try {
packageUpgradeMapper.delete(wrapper);
}catch (Exception e){
e.printStackTrace();
}
return ResponseData.success();
}
@RequestMapping(value = "getPackage",method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> getPackage(){
Wrapper<Package> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("id,name,package_name as packageName");
List<Map<String,Object>> packageList = packageMapper.selectMaps(wrapper);
return ResponseData.success(packageList);
}
}
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
...@@ -217,12 +217,12 @@ public class RhZhiNenTask { ...@@ -217,12 +217,12 @@ public class RhZhiNenTask {
saleId1 = itmeJson.getString("saleId"); saleId1 = itmeJson.getString("saleId");
} }
} else if (itmeJson.getString("propertyName").indexOf("提速包") != -1) { } else if (itmeJson.getString("propertyName").indexOf("提速包") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
} else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) { } else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
...@@ -246,12 +246,12 @@ public class RhZhiNenTask { ...@@ -246,12 +246,12 @@ public class RhZhiNenTask {
net.sf.json.JSONObject itmeJson = net.sf.json.JSONObject.fromObject(saleList.get(i)); net.sf.json.JSONObject itmeJson = net.sf.json.JSONObject.fromObject(saleList.get(i));
// 判断获取的全部产品与订单产品符合的拿取对应的ID // 判断获取的全部产品与订单产品符合的拿取对应的ID
if (itmeJson.getString("propertyName").indexOf("提速包") != -1) { if (itmeJson.getString("propertyName").indexOf("提速包") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
} else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) { } else if (itmeJson.getString("propertyName").indexOf("增值业务") != -1) {
if (itmeJson.getString("name").equals(expenses)) { if (expenses.equals(itmeJson.getString("name"))) {
// 获取对应产品ID // 获取对应产品ID
saleId2 = itmeJson.getString("saleId"); saleId2 = itmeJson.getString("saleId");
} }
......
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