youxiw2000 / trash · Commits

Commit 06cb807b545093c2fb941709c81d42bd799333df

Authored by youxiw2000
1 parent 10097d54

m

Inline Side-by-side
Showing 8 changed files with 49 additions and 28 deletions
trash-common/pom.xml
  View file @06cb807
... ... @@ -131,7 +131,7 @@
131 131 <dependency>
132 132 <groupId>com.huaweicloud</groupId>
133 133 <artifactId>esdk-obs-java</artifactId>
134   - <version>[3.20.6.1,)</version>
  134 + <version>3.24.12</version>
135 135 </dependency>
136 136 <!-- mybatis-plus 增强CRUD -->
137 137 <dependency>
... ...
trash-garbage/pom.xml
  View file @06cb807
... ... @@ -3,6 +3,14 @@
3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5 5 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  6 +
  7 +
  8 + <repositories>
  9 + <repository>
  10 + <id>central</id>
  11 + <url>https://repo.maven.apache.org/maven2</url>
  12 + </repository>
  13 + </repositories>
6 14 <parent>
7 15 <artifactId>trash</artifactId>
8 16 <groupId>com.trash</groupId>
... ... @@ -19,23 +27,23 @@
19 27 <dependency>
20 28 <groupId>com.google.zxing</groupId>
21 29 <artifactId>javase</artifactId>
22   - <version>3.5.3</version>
  30 + <version>3.3.0</version>
23 31 </dependency>
24 32  
25 33 <dependency>
26 34 <groupId>com.google.zxing</groupId>
27 35 <artifactId>core</artifactId>
28   - <version>3.5.3</version>
  36 + <version>3.3.0</version>
29 37 </dependency>
30 38  
31   - <!-- https://mvnrepository.com/artifact/QRCode/QRCode -->
  39 + <!-- https://mvnrepository.com/artifact/QRCode/QRCode
32 40 <dependency>
33 41 <groupId>com.github</groupId>
34 42 <artifactId>QRCode</artifactId>
35 43 <version>1.0.0</version>
36 44 <classifier>sources</classifier>
37 45 <type>java-source</type>
38   - </dependency>
  46 + </dependency>-->
39 47  
40 48  
41 49 <dependency>
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @06cb807
1 1 package com.trash.garbage.service.impl;
2 2  
3 3 import java.security.spec.AlgorithmParameterSpec;
4   -import java.util.*;
  4 +import java.util.ArrayList;
  5 +import java.util.Arrays;
  6 +import java.util.Collections;
  7 +import java.util.HashMap;
  8 +import java.util.HashSet;
  9 +import java.util.List;
  10 +import java.util.Map;
  11 +import java.util.Objects;
  12 +import java.util.Set;
5 13 import java.util.concurrent.TimeUnit;
6 14  
7 15 import javax.annotation.Resource;
... ... @@ -10,13 +18,6 @@ import javax.crypto.spec.IvParameterSpec;
10 18 import javax.crypto.spec.SecretKeySpec;
11 19 import javax.servlet.http.HttpServletRequest;
12 20  
13   -import com.alibaba.fastjson.JSON;
14   -import com.alibaba.fastjson.JSONArray;
15   -import com.trash.disposalSite.domain.DisposalSite;
16   -import com.trash.disposalSite.service.IDisposalSiteService;
17   -import com.trash.garbage.pojo.domain.GarUserReq;
18   -import com.trash.garbage.pojo.domain.GarUserReqDetail;
19   -import com.trash.garbage.utils.SMSUtils;
20 21 import org.apache.commons.codec.binary.Base64;
21 22 import org.apache.commons.collections4.CollectionUtils;
22 23 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -25,6 +26,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
25 26 import org.springframework.stereotype.Service;
26 27 import org.springframework.transaction.annotation.Transactional;
27 28  
  29 +import com.alibaba.fastjson.JSON;
  30 +import com.alibaba.fastjson.JSONArray;
28 31 import com.alibaba.fastjson.JSONObject;
29 32 import com.aliyuncs.exceptions.ClientException;
30 33 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
... ... @@ -38,6 +41,8 @@ import com.trash.common.core.domain.model.LoginUser;
38 41 import com.trash.common.core.redis.RedisCache;
39 42 import com.trash.common.utils.SecurityUtils;
40 43 import com.trash.common.utils.StringUtils;
  44 +import com.trash.disposalSite.domain.DisposalSite;
  45 +import com.trash.disposalSite.service.IDisposalSiteService;
41 46 import com.trash.driver.domain.vo.DriverVo;
42 47 import com.trash.driver.service.IDriverService;
43 48 import com.trash.enterprise.domain.TransportationEnterprise;
... ... @@ -51,12 +56,15 @@ import com.trash.garbage.global.ResultCode;
51 56 import com.trash.garbage.mapper.GarUserMapper;
52 57 import com.trash.garbage.pojo.domain.GarAddress;
53 58 import com.trash.garbage.pojo.domain.GarUser;
  59 +import com.trash.garbage.pojo.domain.GarUserReq;
  60 +import com.trash.garbage.pojo.domain.GarUserReqDetail;
54 61 import com.trash.garbage.pojo.dto.AddressDto;
55 62 import com.trash.garbage.pojo.dto.LoginDto;
56 63 import com.trash.garbage.pojo.vo.LoginVo;
57 64 import com.trash.garbage.service.GarAddressService;
58 65 import com.trash.garbage.service.GarUserService;
59 66 import com.trash.garbage.utils.JwtUtils;
  67 +import com.trash.garbage.utils.SMSUtils;
60 68 import com.trash.garbage.utils.ValidateCodeUtil;
61 69  
62 70 import cn.hutool.core.collection.CollectionUtil;
... ...
trash-ui/dist.7z
View file @06cb807
No preview for this file type
trash-ui/src/views/unit/dropPointInfo/index.vue
  View file @06cb807
... ... @@ -39,7 +39,7 @@
39 39 icon="el-icon-plus"
40 40 size="mini"
41 41 @click="handleAdd"
42   - v-hasPermi="['unit:dropPointInfo:add']"
  42 + v-hasPermi="['business.supervision.droppoint.insert']"
43 43 >新增
44 44 </el-button>
45 45 </el-col>
... ... @@ -50,7 +50,7 @@
50 50 size="mini"
51 51 :disabled="single"
52 52 @click="handleUpdate"
53   - v-hasPermi="['unit:dropPointInfo:edit']"
  53 + v-hasPermi="['business.supervision.droppoint.edit']"
54 54 >修改
55 55 </el-button>
56 56 </el-col>
... ... @@ -61,7 +61,7 @@
61 61 size="mini"
62 62 :disabled="multiple"
63 63 @click="handleDelete"
64   - v-hasPermi="['unit:dropPointInfo:remove']"
  64 + v-hasPermi="['business.supervision.droppoint.delete']"
65 65 >删除
66 66 </el-button>
67 67 </el-col>
... ... @@ -71,7 +71,7 @@
71 71 icon="el-icon-download"
72 72 size="mini"
73 73 @click="handleExport"
74   - v-hasPermi="['unit:dropPointInfo:export']"
  74 + v-hasPermi="['business.supervision.droppoint.export']"
75 75 >导出
76 76 </el-button>
77 77 </el-col>
... ...
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
  View file @06cb807
... ... @@ -76,21 +76,22 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
76 76 {
77 77 dropPointInfo.setCreateTime(DateUtils.getNowDate());
78 78 dropPointInfo.setCreateBy(SecurityUtils.getUsername());
79   -
  79 + dropPointInfo.setStatus(1);
80 80 int i = dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
81 81  
82 82 if(i == 0){
83 83 return i;
84 84 }
85   - Map<String, String> map = new HashMap<String, String>();
86   - map.put("name", dropPointInfo.getDropPointName());
87   - map.put("area", dropPointInfo.getDistrict());
88   - map.put("id", dropPointInfo.getId()+"");
89   -
90   - i = workflow.createDropPointWorkFlow(map);
91   - if (i == 0) {
92   - dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
93   - }
  85 + //先不提交流程
  86 +// Map<String, String> map = new HashMap<String, String>();
  87 +// map.put("name", dropPointInfo.getDropPointName());
  88 +// map.put("area", dropPointInfo.getDistrict());
  89 +// map.put("id", dropPointInfo.getId()+"");
  90 +//
  91 +// i = workflow.createDropPointWorkFlow(map);
  92 +// if (i == 0) {
  93 +// dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
  94 +// }
94 95  
95 96 return i;
96 97 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @06cb807
... ... @@ -88,8 +88,10 @@ public class ViolationCaseFileController extends BaseController {
88 88 }
89 89 }
90 90  
91   - if(list.get(i).getStatus() == 1){
  91 + if (list.get(i).getStatus() == 1) {
92 92 list.get(i).status1 = "结案存档";
  93 + }else if (list.get(i).getStatus() == 2) {
  94 + list.get(i).status1 = "被驳回";
93 95 }else if(list.get(i).getReadBy() == null || list.get(i).getReadBy().isEmpty()){
94 96 list.get(i).status1 = "未回复";
95 97 }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @06cb807
... ... @@ -83,6 +83,8 @@ public class ViolationWarningInformationController extends BaseController
83 83  
84 84 if(list.get(i).getStatus() == 1){
85 85 list.get(i).status1 = "结案存档";
  86 + }else if (list.get(i).getStatus() == 2) {
  87 + list.get(i).status1 = "被驳回";
86 88 }else if(list.get(i).getReadBy() == null){
87 89 list.get(i).status1 = "未回复";
88 90 }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
... ...