youxiw2000 / trash · Commits

Commit 387d1c801c970953644d666e38d46e89b4e0431c

Authored by youxiw2000
1 parent 2354d026
build: skipped

m

Inline Side-by-side
Showing 12 changed files with 94 additions and 16 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @387d1c8
... ... @@ -442,6 +442,8 @@ public class ActTaskServiceImpl implements IActTaskService {
442 442 return;
443 443  
444 444 if (task != null) {
  445 + String token = SecurityUtils.getLoginUser().getToken();
  446 +
445 447 new Thread(new Runnable() {
446 448  
447 449 @Override
... ... @@ -459,8 +461,8 @@ public class ActTaskServiceImpl implements IActTaskService {
459 461  
460 462 if (processInstance.getProcessDefinitionKey().equals("workflow_constructsite")) {
461 463  
462   - JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1]);
463   - if (json != null)
  464 + JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1],token);
  465 + if (json != null)
464 466 smsString = "审批提醒：您有新的工作流程需要审批 " + json.getString("areaCodeName") + " "
465 467 + json.getString("name");
466 468  
... ...
trash-common/src/main/java/com/trash/common/utils/util/PostSms.java
  View file @387d1c8
... ... @@ -81,6 +81,53 @@ public static JsonSmsSend sendSms(List<Mobile> mobileList, String smsStr){
81 81 e.printStackTrace();}
82 82 return jsonSmsSend;
83 83 }
  84 +
  85 +//提交短信
  86 +public static JsonSmsSend sendSms(List<Mobile> mobileList, String smsStr,String c){
  87 +
  88 + String userName = SmsConf.smsUserName;
  89 + String password = SmsConf.smsPasswd;
  90 + String signTime = SmsConf.getSysTime();
  91 + JsonSmsSend jsonSmsSend=new JsonSmsSend();
  92 + try{
  93 + String signStr = Md5Util.strToMD5(userName+ Md5Util.strToMD5(password)+signTime);
  94 + if(smsStr!=null && !smsStr.isEmpty()){
  95 + if(mobileList!=null && !mobileList.isEmpty()){
  96 + if(PostSms.queryBalanceNum()>=mobileList.size()){
  97 + SendSms sendSms = new SendSms();
  98 + sendSms.setUserName(userName);
  99 + sendSms.setSignStr(signStr);
  100 + sendSms.setSignTime(signTime);
  101 + sendSms.setSignStr(signStr);
  102 + sendSms.setSmsStr(Base64Util.encodeData(smsStr));
  103 + sendSms.setMobileList(mobileList);
  104 + sendSms.setSubcodeStr(c);
  105 + String reqJsonStr = JsonUtil.toJson(sendSms);
  106 + String resultJsonStr=SmsHttp.postJson(SmsConf.smsSendUrl, reqJsonStr);
  107 + if(JsonUtil.isJsonStr(resultJsonStr)){
  108 + jsonSmsSend= JsonUtil.returnObj(resultJsonStr, JsonSmsSend.class);
  109 + }else{
  110 + jsonSmsSend.setState(-1);
  111 + jsonSmsSend.setMessage(resultJsonStr);
  112 + }
  113 + }else{
  114 + jsonSmsSend.setState(-1);
  115 + jsonSmsSend.setMessage("账户余额不够");
  116 + }
  117 + }else{
  118 + jsonSmsSend.setState(-1);
  119 + jsonSmsSend.setMessage("发送号码不能空");
  120 + }
  121 + }else{
  122 + jsonSmsSend.setState(-1);
  123 + jsonSmsSend.setMessage("发送内容不能空");
  124 + }
  125 + }catch(Exception e){
  126 + jsonSmsSend.setState(-1);
  127 + jsonSmsSend.setMessage(e.toString());
  128 + e.printStackTrace();}
  129 + return jsonSmsSend;
  130 +}
84 131  
85 132 //接收短信状态回执
86 133 public static JsonRpt getSmsRpt(){
... ...
trash-common/src/main/java/com/trash/common/utils/vo/mt/SendSms.java
  View file @387d1c8
... ... @@ -9,6 +9,17 @@ public class SendSms {
9 9 private String signTime;//提交时间
10 10 private String smsStr;//短信内容转BASE64
11 11 private List<Mobile> mobileList;//发送号码列表 最多2000个
  12 + private String subcodeStr = "43110044";
  13 +
  14 +
  15 +
  16 + public String getSubcodeStr() {
  17 + return subcodeStr;
  18 + }
  19 +
  20 + public void setSubcodeStr(String subcodeStr) {
  21 + this.subcodeStr = subcodeStr;
  22 + }
12 23  
13 24 public String getUserName() {
14 25 return userName;
... ...
trash-garbage/src/main/java/com/trash/garbage/utils/SMSUtils.java
  View file @387d1c8
... ... @@ -38,7 +38,7 @@ public class SMSUtils {
38 38 List<Mobile> mobileList = new ArrayList<Mobile>();
39 39 mobileList.add(mobile);
40 40 //更新提交信息
41   - JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
  41 + JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content,"43110074");
42 42 }
43 43  
44 44 @Async
... ... @@ -51,7 +51,7 @@ public class SMSUtils {
51 51 mobileList.add(mobile);
52 52 }
53 53 //更新提交信息
54   - JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
  54 + JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content,"43110074");
55 55 }
56 56  
57 57 }
58 58 \ No newline at end of file
... ...
trash-ui/dist.7z
View file @387d1c8
No preview for this file type
trash-ui/package.json
  View file @387d1c8
... ... @@ -44,12 +44,12 @@
44 44 "@riophae/vue-treeselect": "0.4.0",
45 45 "axios": "0.18.1",
46 46 "clipboard": "2.0.4",
47   - "core-js": "^3.30.0",
48   - "echarts": "^4.2.1",
  47 + "core-js": "^3.42.0",
  48 + "echarts": "^4.9.0",
49 49 "element-ui": "2.13.2",
50 50 "file-saver": "2.0.1",
51 51 "fuse.js": "3.4.4",
52   - "gcoord": "^1.0.5",
  52 + "gcoord": "^1.0.7",
53 53 "html2pdf.js": "^0.10.3",
54 54 "husky": "^8.0.3",
55 55 "js-beautify": "1.10.2",
... ...
trash-ui/src/api/vio_casefile.js
  View file @387d1c8
... ... @@ -216,15 +216,14 @@ export default {
216 216 if(item.status == 1){
217 217 return "结案存档";
218 218 }
219   - if(!item.readBy){
220   - return "未回复";
221   - }
222 219 if(item.status1 && Number(item.status1) == 1){
223 220 return "已回复";
224 221 }
225 222 if(item.status1 && Number(item.status1) > 1){
226 223 return "审核中";
227 224 }
  225 + return "未回复";
  226 +
228 227 },
229 228 getCaseType(type){
230 229 for(let i in this.caseType){
... ... @@ -477,7 +476,7 @@ export default {
477 476  
478 477 if(query.owningRegion)
479 478 query.owningRegion = query.owningRegion + ""
480   -
  479 +
481 480 this.$confirm('是否确认导出所有预警信息数据项?', "警告", {
482 481 confirmButtonText: "确定",
483 482 cancelButtonText: "取消",
... ...
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
  View file @387d1c8
... ... @@ -28,7 +28,7 @@
28 28 {{ owningRegion != "" && owningRegion != null ? owningRegion+"" : "长沙市" }}</h3>
29 29  
30 30 <h4>
31   - 该区域信息数{{allCount[2]}}，回复数{{allCount[3]}}，回率{{allCount[4]}}
  31 + 该区域信息数{{allCount[2]}}，回复数{{allCount[3]}}，回复率{{allCount[4]}}
32 32 </h4>
33 33  
34 34 </template>
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @387d1c8
... ... @@ -92,7 +92,7 @@ public class ViolationCaseFileController extends BaseController {
92 92 list.get(i).status1 = "结案存档";
93 93 }else if (list.get(i).getStatus() == 2) {
94 94 list.get(i).status1 = "被驳回";
95   - }else if(list.get(i).getReadBy() == null || list.get(i).getReadBy().isEmpty()){
  95 + }else if(list.get(i).status1 == null || Integer.parseInt(list.get(i).status1) == 0){
96 96 list.get(i).status1 = "未回复";
97 97 }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
98 98 list.get(i).status1 = "已回复";
... ... @@ -238,7 +238,7 @@ public class ViolationCaseFileController extends BaseController {
238 238 for (ViolationCaseFile file : list) {
239 239 if (type.getDictValue().equals(file.getViolationType())) {
240 240 count += 1;
241   - if (file.getReadBy() != null && !file.getReadBy().isEmpty()) {
  241 + if (file.status1 != null && Integer.parseInt(file.status1) > 0) {
242 242 repCount += 1;
243 243 }
244 244  
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @387d1c8
... ... @@ -94,7 +94,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
94 94  
95 95 if (violationCaseFile.getStatus1() != null) {
96 96 if (violationCaseFile.getStatus1().equals("0")) {
97   - violationCaseFile.setStatus1(" and (read_by is null or read_by = '')");
  97 + violationCaseFile.setStatus1(" and status1 is null and status = 0");
98 98 } else if (violationCaseFile.getStatus1().equals("1")) {
99 99 violationCaseFile.setStatus1(" and status1 = 1 and status = 0");
100 100 } else if (violationCaseFile.getStatus1().equals("2")) {
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @387d1c8
... ... @@ -85,6 +85,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
85 85 String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; // 车企人外区
86 86  
87 87 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  88 +
  89 + String inArea = "芙蓉区,天心区,开福区,雨花区";
88 90  
89 91 @Autowired
90 92 IActWorkflowFormDataService awfServer;
... ... @@ -130,6 +132,19 @@ public class WorkflowServiceImpl implements IWorkflowService {
130 132 break;
131 133 }
132 134 }
  135 + }else if (flowType.equals("workflow_earthsites")|| flowType.equals("workflow_earthsites_edit")) {
  136 + for (Object obj : areas) {
  137 + JSONObject jsonObject = (JSONObject) obj;
  138 + if (areaCode.equals(jsonObject.getString("code"))) {
  139 + if (inArea.contains(jsonObject.getString("name"))) {
  140 + index = 2;
  141 + }
  142 + if (tcdOutArea.contains(jsonObject.getString("name"))||jsonObject.getString("name").contains("湘江") ) {
  143 + index = 1;
  144 + }
  145 + break;
  146 + }
  147 + }
133 148 } else {
134 149 for (Object obj : areas) {
135 150 JSONObject jsonObject = (JSONObject) obj;
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
  View file @387d1c8
... ... @@ -75,7 +75,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
75 75 </select>
76 76  
77 77 <select id="selectViolationCaseFileListByTable" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
78   - <include refid="selectViolationCaseFileVo"/>
  78 + select a.*,c.status1 from casefile_violation a
  79 + left join (select a.table_name,count(*) status1 from
  80 + (select * from reply_approval_process b where table_name like "%workflow_casefile%" GROUP BY b.table_name,b.reply_people) a
  81 + group by a.table_name) c
  82 + on CONCAT("workflow_casefile:",a.id) = c.table_name
79 83 <where>
80 84 <if test="owningRegion != null and owningRegion != ''">and LOCATE(owning_region , #{owningRegion}) > 0</if>
81 85 <if test="startDate!=null and endDate!=null and startDate!='' and endDate!=''">and create_time between #{startDate} and #{endDate}</if>
... ...