m

youxiw2000
1 parent 2354d026
Showing 12 changed files with 94 additions and 16 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-common/src/main/java/com/trash/common/utils/util/PostSms.java
trash-common/src/main/java/com/trash/common/utils/vo/mt/SendSms.java
trash-garbage/src/main/java/com/trash/garbage/utils/SMSUtils.java
trash-ui/dist.7z
trash-ui/package.json
trash-ui/src/api/vio_casefile.js
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
@@ -442,6 +442,8 @@ public class ActTaskServiceImpl implements IActTaskService {
 			return;
 		if (task != null) {
+			String token = SecurityUtils.getLoginUser().getToken();
+			
 			new Thread(new Runnable() {
 				@Override
@@ -459,8 +461,8 @@ public class ActTaskServiceImpl implements IActTaskService {
 						if (processInstance.getProcessDefinitionKey().equals("workflow_constructsite")) {
-							JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1]);
-							if (json != null)
+							JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1],token);
+							if (json != null) 
 								smsString = "审批提醒：您有新的工作流程需要审批 " + json.getString("areaCodeName") + " "
 										+ json.getString("name");
@@ -81,6 +81,53 @@ public static JsonSmsSend sendSms(List&lt;Mobile&gt; mobileList, String smsStr){
 		e.printStackTrace();}
 	return jsonSmsSend;
 }
+
+//提交短信
+public static JsonSmsSend sendSms(List<Mobile> mobileList, String smsStr,String c){
+	
+	String userName = SmsConf.smsUserName;
+	String password = SmsConf.smsPasswd;
+	String signTime = SmsConf.getSysTime();
+	JsonSmsSend jsonSmsSend=new JsonSmsSend();
+	try{	
+		String signStr = Md5Util.strToMD5(userName+ Md5Util.strToMD5(password)+signTime);
+		if(smsStr!=null && !smsStr.isEmpty()){
+		   if(mobileList!=null && !mobileList.isEmpty()){
+				 if(PostSms.queryBalanceNum()>=mobileList.size()){
+					 SendSms sendSms = new SendSms();
+					 sendSms.setUserName(userName);
+					 sendSms.setSignStr(signStr);
+					 sendSms.setSignTime(signTime);
+					 sendSms.setSignStr(signStr);
+					 sendSms.setSmsStr(Base64Util.encodeData(smsStr));
+					 sendSms.setMobileList(mobileList);
+					 sendSms.setSubcodeStr(c);
+					 String reqJsonStr = JsonUtil.toJson(sendSms);
+					 String resultJsonStr=SmsHttp.postJson(SmsConf.smsSendUrl, reqJsonStr);
+					 if(JsonUtil.isJsonStr(resultJsonStr)){
+					   jsonSmsSend= JsonUtil.returnObj(resultJsonStr, JsonSmsSend.class);
+					 }else{
+					   jsonSmsSend.setState(-1);
+					   jsonSmsSend.setMessage(resultJsonStr);
+					 }
+				 }else{
+					jsonSmsSend.setState(-1);
+					jsonSmsSend.setMessage("账户余额不够");
+				}
+		   }else{
+			 jsonSmsSend.setState(-1);
+			 jsonSmsSend.setMessage("发送号码不能空");
+		   }
+	    }else{
+			jsonSmsSend.setState(-1);
+			jsonSmsSend.setMessage("发送内容不能空");
+	    }
+	}catch(Exception e){
+		jsonSmsSend.setState(-1);
+		jsonSmsSend.setMessage(e.toString());
+		e.printStackTrace();}
+	return jsonSmsSend;
+}
 //接收短信状态回执
 public static JsonRpt getSmsRpt(){
@@ -9,6 +9,17 @@ public class SendSms {
 	private String signTime;//提交时间
 	private String smsStr;//短信内容转BASE64
 	private List<Mobile> mobileList;//发送号码列表 最多2000个
+	private String subcodeStr = "43110044";
+	
+	
+
+	public String getSubcodeStr() {
+		return subcodeStr;
+	}
+
+	public void setSubcodeStr(String subcodeStr) {
+		this.subcodeStr = subcodeStr;
+	}
 	public String getUserName() {
 		return userName;
@@ -38,7 +38,7 @@ public class SMSUtils {
         List<Mobile> mobileList = new ArrayList<Mobile>();
         mobileList.add(mobile);
         //更新提交信息
-        JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
+        JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content,"43110074");
     }
     @Async
@@ -51,7 +51,7 @@ public class SMSUtils {
             mobileList.add(mobile);
         }
         //更新提交信息
-        JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content);
+        JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, content,"43110074");
     }
 }
 \ No newline at end of file
@@ -44,12 +44,12 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
-    "core-js": "^3.30.0",
-    "echarts": "^4.2.1",
+    "core-js": "^3.42.0",
+    "echarts": "^4.9.0",
     "element-ui": "2.13.2",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
-    "gcoord": "^1.0.5",
+    "gcoord": "^1.0.7",
     "html2pdf.js": "^0.10.3",
     "husky": "^8.0.3",
     "js-beautify": "1.10.2",
@@ -216,15 +216,14 @@ export default {
       if(item.status == 1){
         return "结案存档";
       }
-      if(!item.readBy){
-        return "未回复";
-      }
       if(item.status1 && Number(item.status1) == 1){
         return "已回复";
       }
       if(item.status1 && Number(item.status1) > 1){
          return "审核中";
       }
+      return "未回复";
+      
     },
     getCaseType(type){
       for(let i in this.caseType){
@@ -477,7 +476,7 @@ export default {
       if(query.owningRegion)
         query.owningRegion = query.owningRegion + ""
-        
+
       this.$confirm('是否确认导出所有预警信息数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -28,7 +28,7 @@
           {{ owningRegion != "" && owningRegion != null ? owningRegion+"" : "长沙市" }}</h3>
           <h4>
-            该区域信息数{{allCount[2]}}，回复数{{allCount[3]}}，回率{{allCount[4]}}
+            该区域信息数{{allCount[2]}}，回复数{{allCount[3]}}，回复率{{allCount[4]}}
           </h4>
         </template>
@@ -92,7 +92,7 @@ public class ViolationCaseFileController extends BaseController {
             	list.get(i).status1 =  "结案存档";
               }else if (list.get(i).getStatus() == 2) {
             	list.get(i).status1 =  "被驳回";
-              }else if(list.get(i).getReadBy() == null || list.get(i).getReadBy().isEmpty()){
+              }else if(list.get(i).status1 == null || Integer.parseInt(list.get(i).status1) == 0){
             	  list.get(i).status1 =  "未回复";
               }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
             	  list.get(i).status1 =  "已回复";
@@ -238,7 +238,7 @@ public class ViolationCaseFileController extends BaseController {
 			for (ViolationCaseFile file : list) {
 				if (type.getDictValue().equals(file.getViolationType())) {
 					count += 1;
-					if (file.getReadBy() != null && !file.getReadBy().isEmpty()) {
+					if (file.status1 != null && Integer.parseInt(file.status1) > 0) {
 						repCount += 1;
 					}
@@ -94,7 +94,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
 		if (violationCaseFile.getStatus1() != null) {
 			if (violationCaseFile.getStatus1().equals("0")) {
-				violationCaseFile.setStatus1(" and (read_by is null or read_by = '')");
+				violationCaseFile.setStatus1(" and status1 is null and status = 0");
 			} else if (violationCaseFile.getStatus1().equals("1")) {
 				violationCaseFile.setStatus1(" and status1 = 1 and status = 0");
 			} else if (violationCaseFile.getStatus1().equals("2")) {
@@ -85,6 +85,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; // 车企人外区
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	
+	String inArea = "芙蓉区,天心区,开福区,雨花区";
 	@Autowired
 	IActWorkflowFormDataService awfServer;
@@ -130,6 +132,19 @@ public class WorkflowServiceImpl implements IWorkflowService {
 						break;
 					}
 				}
+			}else if (flowType.equals("workflow_earthsites")|| flowType.equals("workflow_earthsites_edit")) {
+				for (Object obj : areas) {
+					JSONObject jsonObject = (JSONObject) obj;
+					if (areaCode.equals(jsonObject.getString("code"))) {
+						if (inArea.contains(jsonObject.getString("name"))) {
+							index = 2;
+						}
+						if (tcdOutArea.contains(jsonObject.getString("name"))||jsonObject.getString("name").contains("湘江") ) {
+							index = 1;
+						}
+						break;
+					}
+				}
 			} else {
 				for (Object obj : areas) {
 					JSONObject jsonObject = (JSONObject) obj;
@@ -75,7 +75,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
     <select id="selectViolationCaseFileListByTable" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
-        <include refid="selectViolationCaseFileVo"/>
+                select a.*,c.status1 from casefile_violation a
+        left join (select a.table_name,count(*) status1 from 
+					(select * from reply_approval_process b where table_name like "%workflow_casefile%" GROUP BY b.table_name,b.reply_people) a
+					group by a.table_name) c 
+		on CONCAT("workflow_casefile:",a.id) = c.table_name
         <where>
             <if test="owningRegion != null and owningRegion != ''">and LOCATE(owning_region , #{owningRegion}) > 0</if>
             <if test="startDate!=null and endDate!=null and startDate!='' and endDate!=''">and create_time between #{startDate} and #{endDate}</if>