m

youxiw2000
1 parent 10097d54
Showing 8 changed files with 49 additions and 28 deletions
trash-common/pom.xml
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-ui/dist.7z
trash-ui/src/views/unit/dropPointInfo/index.vue
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java</artifactId>
-            <version>[3.20.6.1,)</version>
+            <version>3.24.12</version>
         </dependency>
 		        <!-- mybatis-plus 增强CRUD -->
         <dependency>
@@ -3,6 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
          http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         
+        
+	<repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+        </repository>
+    </repositories>
     <parent>
         <artifactId>trash</artifactId>
         <groupId>com.trash</groupId>
@@ -19,23 +27,23 @@
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.5.3</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.5.3</version>
+            <version>3.3.0</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/QRCode/QRCode -->
+        <!-- https://mvnrepository.com/artifact/QRCode/QRCode 
         <dependency>
             <groupId>com.github</groupId>
             <artifactId>QRCode</artifactId>
             <version>1.0.0</version>
             <classifier>sources</classifier>
             <type>java-source</type>
-        </dependency>
+        </dependency>-->
         <dependency>
 package com.trash.garbage.service.impl;
 import java.security.spec.AlgorithmParameterSpec;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
@@ -10,13 +18,6 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.trash.disposalSite.domain.DisposalSite;
-import com.trash.disposalSite.service.IDisposalSiteService;
-import com.trash.garbage.pojo.domain.GarUserReq;
-import com.trash.garbage.pojo.domain.GarUserReqDetail;
-import com.trash.garbage.utils.SMSUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -38,6 +41,8 @@ import com.trash.common.core.domain.model.LoginUser;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
+import com.trash.disposalSite.domain.DisposalSite;
+import com.trash.disposalSite.service.IDisposalSiteService;
 import com.trash.driver.domain.vo.DriverVo;
 import com.trash.driver.service.IDriverService;
 import com.trash.enterprise.domain.TransportationEnterprise;
@@ -51,12 +56,15 @@ import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.mapper.GarUserMapper;
 import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
+import com.trash.garbage.pojo.domain.GarUserReq;
+import com.trash.garbage.pojo.domain.GarUserReqDetail;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.pojo.vo.LoginVo;
 import com.trash.garbage.service.GarAddressService;
 import com.trash.garbage.service.GarUserService;
 import com.trash.garbage.utils.JwtUtils;
+import com.trash.garbage.utils.SMSUtils;
 import com.trash.garbage.utils.ValidateCodeUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -39,7 +39,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['unit:dropPointInfo:add']"
+          v-hasPermi="['business.supervision.droppoint.insert']"
         >新增
         </el-button>
       </el-col>
@@ -50,7 +50,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['unit:dropPointInfo:edit']"
+          v-hasPermi="['business.supervision.droppoint.edit']"
         >修改
         </el-button>
       </el-col>
@@ -61,7 +61,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['unit:dropPointInfo:remove']"
+          v-hasPermi="['business.supervision.droppoint.delete']"
         >删除
         </el-button>
       </el-col>
@@ -71,7 +71,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['unit:dropPointInfo:export']"
+          v-hasPermi="['business.supervision.droppoint.export']"
         >导出
         </el-button>
       </el-col>
@@ -76,21 +76,22 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
     {
         dropPointInfo.setCreateTime(DateUtils.getNowDate());
         dropPointInfo.setCreateBy(SecurityUtils.getUsername());
-        
+        dropPointInfo.setStatus(1);
         int i = dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
         if(i == 0){
         	return i;
         }
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("name", dropPointInfo.getDropPointName());
-        map.put("area", dropPointInfo.getDistrict());
-        map.put("id", dropPointInfo.getId()+"");
-        
-        i = workflow.createDropPointWorkFlow(map);
-        if (i == 0) {
-        	dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
-		}
+        //先不提交流程
+//        Map<String, String> map = new HashMap<String, String>();
+//        map.put("name", dropPointInfo.getDropPointName());
+//        map.put("area", dropPointInfo.getDistrict());
+//        map.put("id", dropPointInfo.getId()+"");
+//        
+//        i = workflow.createDropPointWorkFlow(map);
+//        if (i == 0) {
+//        	dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
+//		}
         return i;
     }
@@ -88,8 +88,10 @@ public class ViolationCaseFileController extends BaseController {
 				}
 			}
-            if(list.get(i).getStatus() == 1){
+			if (list.get(i).getStatus() == 1) {
             	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()){
             	  list.get(i).status1 =  "未回复";
               }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
@@ -83,6 +83,8 @@ public class ViolationWarningInformationController extends BaseController
             if(list.get(i).getStatus() == 1){
             	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).status1 =  "未回复";
               }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){