工单处理功能提交

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/controller/LookOverController.java

@@ -34,12 +34,12 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * 巡视相关controller
+ * 巡查相关controller
  * @author 王强
  * @version 1.0
  * @date 2024-08-29 10:40
  */
-@Api(tags ="巡视")
+@Api(tags ="巡查")
 @RestController
 @RequestMapping(value = "/app/look/over")
 public class LookOverController {
@@ -59,7 +59,7 @@ public class LookOverController {
     private static final byte[] SYN_BYTE = new byte[0];
 
     /**
-     * 查询巡视工单
+     * 查询巡查工单
      *
      * @param id
      * @return
@@ -73,10 +73,10 @@ public class LookOverController {
     }
 
     /**
-     * 保存巡视信息
+     * 保存巡查信息
      */
-    @ApiLog("保存巡视信息")
-    @ApiOperation(value = "保存巡视信息")
+    @ApiLog("保存巡查信息")
+    @ApiOperation(value = "保存巡查信息")
     @PostMapping("save")
     public  ResponseEntity <String> save(@Valid @RequestBody LookOver lookOver) {
         synchronized (SYN_BYTE) {
@@ -211,10 +211,10 @@ public class LookOverController {
     }
 
     /**
-     * 保存巡视信息
+     * 保存巡查信息
      */
-    @ApiLog("保存巡视信息处理中后的图片信息")
-    @ApiOperation(value = "保存巡视信息处理中后的图片信息")
+    @ApiLog("保存巡查信息处理中后的图片信息")
+    @ApiOperation(value = "保存巡查信息处理中后的图片信息")
     @PostMapping("savePhoto")
     public  ResponseEntity <String> savePhoto(@Valid @RequestBody LookOver lookOver) {
         //新增或编辑表单保存
@@ -293,10 +293,10 @@ public class LookOverController {
     }
 
     /**
-     * 查询最大的巡视工单
+     * 查询最大的巡查工单
      */
-    @ApiLog("查询最大的巡视工单")
-    @ApiOperation(value = "查询最大的巡视工单")
+    @ApiLog("查询最大的巡查工单")
+    @ApiOperation(value = "查询最大的巡查工单")
     @GetMapping("getMaxNo")
     public ResponseEntity<String> getMaxNo() {
         //获取当前人所属部门信息
@@ -389,12 +389,12 @@ public class LookOverController {
     }
 
     /**
-     * 查询未处理巡视单
+     * 查询未处理巡查单
      * @param lookOver
      * @param page
      * @return
      */
-    @ApiLog("查询未处理巡视单")
+    @ApiLog("查询未处理巡查单")
     @GetMapping("getNotDisposeList")
     public ResponseEntity<IPage<LookOver>> getNotDisposeList(LookOverDTO lookOver, Page<LookOverDTO> page) throws Exception {
         IPage<LookOver> result = new Page<LookOver>();

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/domain/LookOver.java

@@ -15,14 +15,14 @@ import java.util.List;
 
 /**
  * <p>
- * 垃圾清运-巡视工单
+ * 垃圾清运-巡查工单
  * </p>
  *
  * @author 王强
  * @since 2024-08-29
  */
 @TableName("garbage_clearance_look_over")
-@ApiModel(value = "GarbageClearanceLookOver对象", description = "垃圾清运-巡视工单")
+@ApiModel(value = "GarbageClearanceLookOver对象", description = "垃圾清运-巡查工单")
 @Data
 public class LookOver extends BaseEntity implements Serializable {
 
@@ -35,7 +35,7 @@ public class LookOver extends BaseEntity implements Serializable {
     @ApiModelProperty("简介")
     private String remarks;
 
-    @ApiModelProperty("巡视工单")
+    @ApiModelProperty("巡查工单")
     private String no;
 
     @ApiModelProperty("处理单位")

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/mapper/LookOverMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- * 垃圾清运-巡视工单 Mapper 接口
+ * 垃圾清运-巡查工单 Mapper 接口
  * </p>
  *
  * @author 王强
@@ -31,7 +31,7 @@ public interface LookOverMapper extends BaseMapper<LookOver> {
     List<UserDTO> getOfficeOnHamlet();
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param id
      * @return
      */

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/service/DTO/LookOverDTO.java

@@ -18,7 +18,7 @@ public class LookOverDTO extends BaseDTO {
     //备注
     private String remarks;
 
-    //巡视工单
+    //巡查工单
     private String no;
 
     //处理单位

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/service/LookOverService.java

@@ -98,7 +98,7 @@ public class LookOverService extends ServiceImpl<LookOverMapper, LookOver> {
     }
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param id
      * @return
      */

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/disposeRubbish/controller/DisposeRubbishController.java

@@ -47,7 +47,7 @@ public class DisposeRubbishController {
     private static final byte[] SYN_BYTE = new byte[0];
 
     /**
-     * 查询巡视工单
+     * 查询巡查工单
      *
      * @param id
      * @return
@@ -57,11 +57,12 @@ public class DisposeRubbishController {
         // 还需要处理单位  清运专员  联系方式  及  附件信息
         DisposeRubbish post = disposeRubbishService.selectById ( id );
 
+
         return ResponseEntity.ok ( post );
     }
 
     /**
-     * 查询巡视工单
+     * 查询巡查工单
      *
      * @param procInsIds
      * @return
@@ -78,10 +79,10 @@ public class DisposeRubbishController {
     }
 
     /**
-     * 保存巡视信息
+     * 保存巡查信息
      */
-    @ApiLog("保存巡视信息")
-    @ApiOperation(value = "保存巡视信息")
+    @ApiLog("保存巡查信息")
+    @ApiOperation(value = "保存巡查信息")
     @PostMapping("save")
     public  ResponseEntity <String> save(@Valid @RequestBody DisposeRubbish disposeRubbish) {
         synchronized (SYN_BYTE) {
@@ -163,10 +164,10 @@ public class DisposeRubbishController {
     }
 
     /**
-     * 查询最大的巡视工单
+     * 查询最大的巡查工单
      */
-    @ApiLog("查询最大的巡视工单")
-    @ApiOperation(value = "查询最大的巡视工单")
+    @ApiLog("查询最大的巡查工单")
+    @ApiOperation(value = "查询最大的巡查工单")
     @GetMapping("getMaxNo")
     public ResponseEntity<String> getMaxNo() {
         String maxNo = disposeRubbishService.getMaxNo();
@@ -174,7 +175,7 @@ public class DisposeRubbishController {
     }
 
     /**
-     * 查询最大的巡视工单
+     * 查询最大的巡查工单
      */
     @ApiLog("查询垃圾站点")
     @ApiOperation(value = "查询垃圾站点")
@@ -221,7 +222,7 @@ public class DisposeRubbishController {
 
 
     /**
-     * 查询巡视工单
+     * 查询巡查工单
      *
      * @param programIds
      * @return
@@ -264,7 +265,7 @@ public class DisposeRubbishController {
     }
 
     /**
-     * 根据编号查询巡视工单
+     * 根据编号查询巡查工单
      * @param no
      * @return
      */

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/disposeRubbish/domain/DisposeRubbish.java

@@ -119,4 +119,8 @@ public class DisposeRubbish extends BaseEntity implements Serializable {
     //展示数量参数
     @TableField(exist = false)
     private Integer count;
+
+    //补贴单价（元）参数
+    @TableField(exist = false)
+    private Integer subsidyUnitPrice;
 }

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/disposeRubbish/mapper/DisposeRubbishMapper.java

@@ -13,14 +13,14 @@ public interface DisposeRubbishMapper extends BaseMapper<DisposeRubbish> {
     UserDTO getUserInfoByOffId(@Param("officeId") String officeId);
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param id
      * @return
      */
     DisposeRubbish selectById(@Param("id") String id);
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param procInsIdList
      * @return
      */
@@ -39,7 +39,7 @@ public interface DisposeRubbishMapper extends BaseMapper<DisposeRubbish> {
     List<DisposeRubbish> getDetailCollectByOfficeIdAndMonth(@Param("officeId")String officeId, @Param("startDate")String startDate, @Param("endDate")String endDate);
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param no
      * @return
      */

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/wdt/disposeRubbish/service/DisposeRubbishService.java

@@ -3,7 +3,11 @@ package com.jeeplus.test.wdt.disposeRubbish.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.sys.domain.Office;
+import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
 import com.jeeplus.test.garbageClearance.service.LookOverService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
@@ -18,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.YearMonth;
@@ -35,6 +40,8 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
     private OssService ossService;
     @Autowired
     private LookOverService lookOverService;
+    @Autowired
+    private OfficeService officeService;
 
     public String getMaxNo() {
         // 创建查询条件构造器
@@ -75,13 +82,40 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
     }
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param id
      * @return
      */
     public DisposeRubbish selectById(String id) {
         DisposeRubbish disposeRubbish = baseMapper.selectById(id);
-        if(StringUtils.isNotBlank(disposeRubbish.getProgramId())){
+        //通过createById获取发起人所属村落。根据所属村落的运输距离和计费方式计算出补贴金额
+        if(null != disposeRubbish && StringUtils.isNotBlank(disposeRubbish.getCreateById())){
+            UserDTO userDTO = UserUtils.get(disposeRubbish.getCreateById());
+            OfficeDTO officeDTO = userDTO.getOfficeDTO();
+            if(null != officeDTO && StringUtils.isNotBlank(officeDTO.getId())){
+                Office office = officeService.getById(officeDTO.getId());
+                if(StringUtils.isNotBlank(office.getHaulDistance())){
+                    disposeRubbish.setTransportMileage(office.getHaulDistance());
+                    //字符串转数字
+                    int haulDistance = Integer.parseInt(office.getHaulDistance());
+                    if(haulDistance<=5){
+                        //5公里内每公里补贴20元
+                        disposeRubbish.setSubsidyUnitPrice(20);
+                    } else if (haulDistance<=10){
+                        //5-10公里每公里补贴22元
+                        disposeRubbish.setSubsidyUnitPrice(22);
+                    } else if (haulDistance<=20){
+                        //10-20公里每公里补贴25元
+                        disposeRubbish.setSubsidyUnitPrice(25);
+                    }else{
+                        //20公里以上每公里补贴28元
+                        disposeRubbish.setSubsidyUnitPrice(28);
+                    }
+                }
+            }
+            System.out.println("");
+        }
+        if(null != disposeRubbish && StringUtils.isNotBlank(disposeRubbish.getProgramId())){
             // 使用 split() 方法将字符串分割为数组
             String[] array = disposeRubbish.getProgramId().split(",");
             // 将数组转换为 List
@@ -112,7 +146,7 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
         return disposeRubbish;
     }
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param procInsIdList
      * @return
      */
@@ -121,7 +155,7 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
     }
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param programIdList
      * @return
      */
@@ -132,7 +166,7 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
     }
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param officeId
      * @return
      */
@@ -229,7 +263,7 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
 
 
     /**
-     * 根据id和年月获取巡视工单信息
+     * 根据id和年月获取巡查工单信息
      * @param officeId
      * @param yearMonth
      * @return
@@ -260,7 +294,7 @@ public class DisposeRubbishService extends ServiceImpl<DisposeRubbishMapper, Dis
 
 
     /**
-     * 根据id获取巡视工单信息
+     * 根据id获取巡查工单信息
      * @param no
      * @return
      */

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -19,6 +19,7 @@ import com.jeeplus.core.excel.ExcelOptions;
 import com.jeeplus.core.excel.annotation.ExportMode;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.security.util.SecurityUtils;
+import com.jeeplus.sys.constant.CacheNames;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
@@ -389,23 +390,32 @@ public class UserController {
             //生成四位随机验证码
             String randomCode = String.valueOf((int) (Math.random() * 9000 + 1000));
 
+            System.out.println(randomCode);
             j.put("success",true);
             j.put("message","短信发送成功!");
             //存放验证码
             //以手机号+为key 五分钟为时效 将验证码进行短期存储
             redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
             HashMap<String,Object> result = null;
-            /*try{
+            try{
                 //调用工具类返回结果
-                result = UserUtils.sendRandomCodes(mobile, randomCode);
-                String statusCode = (String) result.get("statusCode");
-                if (("000000").equals(statusCode)) {
+                result = ALiYunSmsUtil.updatePasswordSendSms(mobile, randomCode);
+                Integer statusCode = (Integer) result.get("statusCode");
+                if (200 == statusCode) {
                     j.put("success",true);
+                    j.put("randomCode",randomCode);
                     j.put("message","短信发送成功!");
                     //存放验证码
                     //以手机号+为key 五分钟为时效 将验证码进行短期存储
-                    redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
-                }else if(statusCode.equals("160040")){
+                    redisUtils.setEx(mobile+ "loginPassword", randomCode, 300, TimeUnit.SECONDS);
+                }else if(10001 == statusCode){
+                    j.put("success",false);
+                    String message = (String) result.get("message");
+                    j.put("message",message);
+                }else if(10002 == statusCode){
+                    j.put("success",false);
+                    j.put("message","账户短信量余额不足，请联系管理员进行充值!");
+                }else if(10003 == statusCode){
                     j.put("success",false);
                     j.put("message","手机号获取验证码次数已达每日上限!");
                 }else{
@@ -417,7 +427,7 @@ public class UserController {
                 e.printStackTrace();
                 j.put("success",false);
                 j.put("message","短信发送失败!");
-            }*/
+            }
         } else {
             j.put("success",false);
             j.put("message","当前手机号未注册!请联系管理员");
@@ -450,8 +460,10 @@ public class UserController {
                 if (ObjectUtil.isNotEmpty( user )) {
                     if (org.apache.commons.lang3.StringUtils.isNotBlank( newPassword )) {
                         user.setPassword(SecurityUtils.encryptPassword ( newPassword ));
-                        userService.updateById( user ); // 修改密码
+                        userService.updatePassword( user ); // 修改密码
                         redisUtils.delete(mobile + "resetPassword"); // 删除redis中的key
+                        //删除redis中的当前人的缓存信息
+                        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_LOGIN_NAME, user.getLoginName ( ) );
                         j.put("success",true);
                         j.put("message","密码修改成功!");
                     } else {

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/domain/Office.java

@@ -8,6 +8,8 @@ import com.jeeplus.core.domain.TreeEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.Size;
+
 /**
  * 机构Entity
  *
@@ -32,6 +34,11 @@ public class Office extends TreeEntity <Office> {
     private String code;
 
     /**
+     * 运输距离
+     */
+    private String haulDistance;
+
+    /**
      * 机构类型（1：公司；2：部门）
      */
     private String type;

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -110,4 +110,12 @@ public interface UserMapper extends BaseMapper <User> {
      */
     List<UserDTO> getUserIdByLoginOrMobile(String userName);
 
+    /**
+     * 修改用户密码
+     *
+     * @param user
+     * @return
+     */
+    void updatePassword(User user);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -25,6 +25,7 @@
                a.update_by_id AS "updateBy.id",
                a.update_time,
                a.del_flag,
+               a.haul_distance as "haulDistance",
                a.useable      AS useable,
                p.name         AS "parent.name"
         FROM sys_office a

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -194,4 +194,10 @@
             and (login_name = #{userName} or mobile = #{userName})
         </where>
     </select>
+
+    <update id="updatePassword">
+        update sys_user set
+        password = #{password}
+        where id = #{id}
+    </update>
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -217,6 +217,14 @@ public class UserService extends ServiceImpl <UserMapper, User> {
     }
 
     /**
+     * 更新用户登录密码
+     * @param user
+     */
+    public void updatePassword(User user) {
+        userMapper.updatePassword (user);
+    }
+
+    /**
      * 根据登录名或手机号获取用户信息
      * @param loginName
      * @return

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/OfficeDTO.java

@@ -34,6 +34,12 @@ public class OfficeDTO extends TreeDTO <OfficeDTO> {
     private String code;
 
     /**
+     * 运输距离
+     */
+    @Size(min = 0, max = 500)
+    private String haulDistance;
+
+    /**
      * 机构类型（1：公司；2：部门）
      */
     @Size(min = 1, max = 1)

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/ALiYunSmsUtil.java

@@ -80,7 +80,58 @@ public class ALiYunSmsUtil {
     }
 
     /**
-     * 发送通知(巡视通知)
+     * 登录验证码
+     * @param phoneNumbers
+     * @param randomCode
+     * @return
+     * @throws Exception
+     */
+    public static HashMap<String,Object> updatePasswordSendSms(String phoneNumbers, String randomCode) throws Exception {
+        HashMap<String,Object> map = new HashMap<>();
+        Config config = new Config()
+                .setAccessKeyId(ACCESS_KEY_ID)
+                .setAccessKeySecret(ACCESS_KEY_SECRET)
+                .setEndpoint(ENDPOINT);
+
+        Client client = new Client(config);
+        SendSmsRequest sendSmsRequest = new SendSmsRequest()
+                .setPhoneNumbers(phoneNumbers)
+                .setSignName(SIGNNAME)
+                /*.setTemplateCode("SMS_472770050")*/
+                .setTemplateCode("SMS_473055008")
+                //此处是设计模版的时候预留的变量${code}就验证码，用下面的随机生成4位数字传入
+                .setTemplateParam(String.format("{\"code\":\"%s\"}", randomCode));
+
+        try {
+            SendSmsResponse sendSmsResponse = client.sendSms(sendSmsRequest);
+            System.out.println(sendSmsResponse);
+            if(sendSmsResponse.body.code.equals("isv.BUSINESS_LIMIT_CONTROL")){
+                if(sendSmsResponse.body.message.contains("触发分钟级流控")){
+                    map.put("message","手机号获取验证码次数已触发每分钟可发送数量上限，请稍后进行重试!");
+                }else if(sendSmsResponse.body.message.contains("触发小时级流控")){
+                    map.put("message","手机号获取验证码次数已触发每小时可发送数量上限，请稍后进行重试!");
+                }else{
+                    map.put("message","手机号获取验证码次数已触发每小时可发送数量上限，请稍后进行重试!");
+                }
+                //触发云通信流控限制 每小时限量
+                map.put("statusCode",10001);
+            }else if(sendSmsResponse.body.code.contains("isv.AMOUNT_NOT_ENOUGH")){
+                //触发账户余额不足
+                map.put("statusCode",10002);
+            }else if(sendSmsResponse.body.code.contains("isv.DAY_LIMIT_CONTROL")){
+                //触发触发日发送限额
+                map.put("statusCode",10003);
+            }else if(sendSmsResponse.body.code.contains("OK")){
+                map.put("statusCode",sendSmsResponse.getStatusCode());
+            }
+            return map;
+        } catch (TeaException error) {
+            return map;
+        }
+    }
+
+    /**
+     * 发送通知(巡查通知)
      * @param phoneNumbers
      * @param no
      * @return