优化diamante

java110-bean/src/main/java/com/java110/dto/resource/ResourceStoreTimesDto.java

@@ -21,6 +21,7 @@ public class ResourceStoreTimesDto extends ResourceStoreDto implements Serializa
 
     private String hasStock;
     private String resCode;
+    private String resCodeLike;
     private String[] resCodes;
     private String timesId;
     private String shId;
@@ -127,4 +128,12 @@ public class ResourceStoreTimesDto extends ResourceStoreDto implements Serializa
     public void setShId(String shId) {
         this.shId = shId;
     }
+
+    public String getResCodeLike() {
+        return resCodeLike;
+    }
+
+    public void setResCodeLike(String resCodeLike) {
+        this.resCodeLike = resCodeLike;
+    }
 }

java110-db/src/main/resources/mapper/store/ResourceStoreTimesV1ServiceDaoImplMapper.xml

@@ -56,7 +56,10 @@
             and rs.parent_rst_id= #{parentRstId}
         </if>
         <if test="resCode !=null and resCode != ''">
-            and t.res_code like concat('%',#{resCode},'%')
+            and t.res_code =#{resCode}
+        </if>
+        <if test="resCodeLike !=null and resCodeLike != ''">
+            and t.res_code like concat('%',#{resCodeLike},'%')
         </if>
         <if test="price !=null and price != ''">
             and t.price= #{price}
@@ -154,7 +157,10 @@
             and rs.parent_rst_id= #{parentRstId}
         </if>
         <if test="resCode !=null and resCode != ''">
-            and t.res_code like concat('%',#{resCode},'%')
+            and t.res_code =#{resCode}
+        </if>
+        <if test="resCodeLike !=null and resCodeLike != ''">
+            and t.res_code like concat('%',#{resCodeLike},'%')
         </if>
         <if test="price !=null and price != ''">
             and t.price= #{price}

service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java

@@ -114,6 +114,7 @@ public class MachineAddOwnerRepairAdapt extends DatabusAdaptImpl {
         paramIn.put("repairObjName", repairObjName);
         paramIn.put("context", context);
         paramIn.put("repairName", repairName);
+        paramIn.put("repairId", repairDtos.get(0).getRepairId());
         sendMessage(paramIn, communityDtos.get(0));
     }
 
@@ -152,6 +153,7 @@ public class MachineAddOwnerRepairAdapt extends DatabusAdaptImpl {
             }
             content.put("repairName",paramIn.getString("repairName"));
             content.put("context",paramIn.getString("context"));
+            content.put("repairId",paramIn.getString("repairId"));
             String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
             content.put("url",wechatUrl);
 

service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java

@@ -234,6 +234,7 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
      */
     private void sendStaffMsg(JSONObject paramIn, CommunityDto communityDto) {
         JSONObject content = new JSONObject();
+        content.put("repairId", paramIn.getString("repairId"));
         content.put("repairName", paramIn.getString("repairName"));
         content.put("tel", paramIn.getString("tel"));
         content.put("time", paramIn.getString("time"));

service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java

@@ -161,6 +161,7 @@ public class MachineReturnRepairAdapt extends DatabusAdaptImpl {
             String preStaffId = repairUserDtos.get(0).getPreStaffId();
             //上级操作人姓名
             String preStaffName = repairUserDtos.get(0).getPreStaffName();
+            paramIn.put("repairId",  repairUserDtos.get(0).getRepairId());
             paramIn.put("repairTypeName", repairTypeName);
             paramIn.put("repairObjName", repairObjName);
             paramIn.put("staffName", staffName);
@@ -224,6 +225,7 @@ public class MachineReturnRepairAdapt extends DatabusAdaptImpl {
 
         JSONObject content = new JSONObject();
         content.put("repairTypeName", paramIn.getString("repairTypeName"));
+        content.put("repairId", paramIn.getString("repairId"));
         if (communityDto.getName().equals(paramIn.getString("repairObjName"))) {
             content.put("repairObjName", paramIn.getString("repairObjName"));
         } else {

service-job/src/main/java/com/java110/job/msgNotify/IMsgNotify.java

@@ -55,6 +55,7 @@ public interface IMsgNotify {
      * @param communityId 小区
      * @param userId 用户
      * @param content {
+     *                repairId,
      *                repairTypeName，
      *                repairObjName，
      *                repairName，
@@ -70,6 +71,7 @@ public interface IMsgNotify {
      * @param communityId 小区
      * @param userId      用户
      * @param content     {
+     *                    repairId,
      *                    repairName，
      *                    tel，
      *                    time，

service-job/src/main/java/com/java110/job/msgNotify/MsgNotifyFactory.java

@@ -128,6 +128,7 @@ public class MsgNotifyFactory {
      * @param communityId 小区
      * @param userId      用户
      * @param content     {
+     *                    repairId,
      *                    repairTypeName，
      *                    repairObjName，
      *                    repairName，
@@ -155,6 +156,7 @@ public class MsgNotifyFactory {
      * @param communityId 小区
      * @param userId      用户
      * @param content     {
+     *                    repairId,
      *                    repairName，
      *                    tel，
      *                    time，
@@ -237,6 +239,7 @@ public class MsgNotifyFactory {
      * @param communityId 小区
      * @param userId      用户
      * @param content     {
+     *                    repairId,
      *                    repairTypeName，
      *                    repairObjName，
      *                    repairName，

service-job/src/main/java/com/java110/job/msgNotify/ali/AliMsgNotifyImpl.java

@@ -14,7 +14,10 @@ import com.java110.core.factory.CommunitySettingFactory;
 import com.java110.core.factory.LogFactory;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.user.StaffAppAuthDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.job.msgNotify.IMsgNotify;
 import com.java110.utils.cache.MappingCache;
@@ -38,6 +41,9 @@ public class AliMsgNotifyImpl implements IMsgNotify {
     @Autowired
     private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public ResultVo sendApplyReturnFeeMsg(String communityId, String userId, JSONObject content) {
         return null;
@@ -104,18 +110,18 @@ public class AliMsgNotifyImpl implements IMsgNotify {
         Date tmpStartDate = null;
         Date tmpEndDate = null;
         for (JSONObject content : contents) {
-            oweFee = oweFee.add(new BigDecimal(content.getDouble("billAmountOwed"))).setScale(2,BigDecimal.ROUND_HALF_UP);
+            oweFee = oweFee.add(new BigDecimal(content.getDouble("billAmountOwed"))).setScale(2, BigDecimal.ROUND_HALF_UP);
             tmpStartDate = DateUtil.getDateFromStringB(content.getString("date").split("~")[0]);
             tmpEndDate = DateUtil.getDateFromStringB(content.getString("date").split("~")[1]);
-            if(startDate == null){
+            if (startDate == null) {
                 startDate = tmpStartDate;
                 endDate = tmpEndDate;
                 continue;
             }
-            if(startDate.getTime()> tmpStartDate.getTime()){
+            if (startDate.getTime() > tmpStartDate.getTime()) {
                 startDate = tmpStartDate;
             }
-            if(endDate.getTime() < tmpEndDate.getTime()){
+            if (endDate.getTime() < tmpEndDate.getTime()) {
                 endDate = tmpEndDate;
             }
         }
@@ -148,29 +154,226 @@ public class AliMsgNotifyImpl implements IMsgNotify {
         return null;
     }
 
+    /**
+     * 发送内容  尊敬的员工，您有一个报修单需要处理，单号为{repairId}，请您及时处理
+     *
+     * @param communityId 小区
+     * @param userId      用户
+     * @param content     {
+     *                    repairId,
+     *                    repairTypeName，
+     *                    repairObjName，
+     *                    repairName，
+     *                    url
+     *                    }
+     * @return
+     */
     @Override
     public ResultVo sendAddOwnerRepairMsg(String communityId, String userId, JSONObject content) {
-        return null;
+        if (StringUtil.isEmpty(userId) || userId.startsWith("-")) {
+            throw new IllegalArgumentException("员工不存在,userId = " + userId);
+        }
+
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        if (userDtos == null || userDtos.size() < 1) {
+            throw new IllegalArgumentException("员工不存在");
+        }
+
+
+        String accessKeyId = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_KEY_ID");
+        String accessSecret = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_SECRET");
+        String region = CommunitySettingFactory.getValue(communityId, "ALI_REGION");
+        String signName = CommunitySettingFactory.getValue(communityId, "ALI_SIGN_NAME");
+        String templateCode = CommunitySettingFactory.getValue(communityId, "ALI_OWE_TEMPLATE_CODE");
+        DefaultProfile profile = DefaultProfile.getProfile(region,
+                accessKeyId,
+                accessSecret);
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        CommonRequest request = new CommonRequest();
+        request.setSysMethod(MethodType.POST);
+        request.setSysDomain("dysmsapi.aliyuncs.com");
+        request.setSysVersion("2017-05-25");
+        request.setSysAction("SendSms");
+        request.putQueryParameter("RegionId", region);
+        request.putQueryParameter("PhoneNumbers", userDtos.get(0).getTel());
+        request.putQueryParameter("SignName", signName);
+        request.putQueryParameter("TemplateCode", templateCode);
+
+        BigDecimal oweFee = new BigDecimal(0);
+
+
+        JSONObject param = new JSONObject();
+        param.put("repairId", content.getString("repairId"));
+        request.putQueryParameter("TemplateParam", param.toString());
+
+        String resParam = "";
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            logger.debug("发送验证码信息：{}", response.getData());
+            resParam = response.getData();
+        } catch (Exception e) {
+            e.printStackTrace();
+            resParam = e.getMessage();
+            throw new IllegalArgumentException("短信工单失败" + e.getMessage());
+        } finally {
+            LogFactory.saveOutLog("SMS", param.toString(), new ResponseEntity(resParam, HttpStatus.OK));
+        }
+        return new ResultVo(ResultVo.CODE_OK, "成功");
     }
 
+    /**
+     *  发送内容  尊敬的员工，您有一个报修单需要处理，单号为{repairId}，请您及时处理
+     * @param communityId 小区
+     * @param userId      用户
+     * @param content     {
+     *                    repairId,
+     *                    repairName，
+     *                    tel，
+     *                    time，
+     *                    address
+     *                    }
+     * @return
+     */
     @Override
     public ResultVo sendDistributeRepairStaffMsg(String communityId, String userId, JSONObject content) {
-        return null;
+
+        if (StringUtil.isEmpty(userId) || userId.startsWith("-")) {
+            throw new IllegalArgumentException("员工不存在,userId = " + userId);
+        }
+
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        if (userDtos == null || userDtos.size() < 1) {
+            throw new IllegalArgumentException("员工不存在");
+        }
+
+
+        String accessKeyId = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_KEY_ID");
+        String accessSecret = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_SECRET");
+        String region = CommunitySettingFactory.getValue(communityId, "ALI_REGION");
+        String signName = CommunitySettingFactory.getValue(communityId, "ALI_SIGN_NAME");
+        String templateCode = CommunitySettingFactory.getValue(communityId, "ALI_OWE_TEMPLATE_CODE");
+        DefaultProfile profile = DefaultProfile.getProfile(region,
+                accessKeyId,
+                accessSecret);
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        CommonRequest request = new CommonRequest();
+        request.setSysMethod(MethodType.POST);
+        request.setSysDomain("dysmsapi.aliyuncs.com");
+        request.setSysVersion("2017-05-25");
+        request.setSysAction("SendSms");
+        request.putQueryParameter("RegionId", region);
+        request.putQueryParameter("PhoneNumbers", userDtos.get(0).getTel());
+        request.putQueryParameter("SignName", signName);
+        request.putQueryParameter("TemplateCode", templateCode);
+
+        BigDecimal oweFee = new BigDecimal(0);
+
+
+        JSONObject param = new JSONObject();
+        param.put("repairId", content.getString("repairId"));
+        request.putQueryParameter("TemplateParam", param.toString());
+
+        String resParam = "";
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            logger.debug("发送验证码信息：{}", response.getData());
+            resParam = response.getData();
+        } catch (Exception e) {
+            e.printStackTrace();
+            resParam = e.getMessage();
+            throw new IllegalArgumentException("短信工单失败" + e.getMessage());
+        } finally {
+            LogFactory.saveOutLog("SMS", param.toString(), new ResponseEntity(resParam, HttpStatus.OK));
+        }
+        return new ResultVo(ResultVo.CODE_OK, "成功");
     }
 
     @Override
     public ResultVo sendDistributeRepairOwnerMsg(String communityId, String userId, JSONObject content) {
-        return null;
+
+        return new ResultVo(ResultVo.CODE_OK,"成功");
+
     }
 
     @Override
     public ResultVo sendFinishRepairOwnerMsg(String communityId, String userId, JSONObject content) {
-        return null;
+
+        return new ResultVo(ResultVo.CODE_OK,"成功");
     }
 
+    /**
+     *
+     * @param communityId 小区
+     * @param userId      用户
+     * @param content     {
+     *                    repairTypeName，
+     *                    repairObjName，
+     *                    repairName，
+     *                    url
+     *                    }
+     * @return
+     */
     @Override
     public ResultVo sendReturnRepairMsg(String communityId, String userId, JSONObject content) {
-        return null;
+        if (StringUtil.isEmpty(userId) || userId.startsWith("-")) {
+            throw new IllegalArgumentException("员工不存在,userId = " + userId);
+        }
+
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+        if (userDtos == null || userDtos.size() < 1) {
+            throw new IllegalArgumentException("员工不存在");
+        }
+
+
+        String accessKeyId = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_KEY_ID");
+        String accessSecret = CommunitySettingFactory.getValue(communityId, "ALI_ACCESS_SECRET");
+        String region = CommunitySettingFactory.getValue(communityId, "ALI_REGION");
+        String signName = CommunitySettingFactory.getValue(communityId, "ALI_SIGN_NAME");
+        String templateCode = CommunitySettingFactory.getValue(communityId, "ALI_OWE_TEMPLATE_CODE");
+        DefaultProfile profile = DefaultProfile.getProfile(region,
+                accessKeyId,
+                accessSecret);
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        CommonRequest request = new CommonRequest();
+        request.setSysMethod(MethodType.POST);
+        request.setSysDomain("dysmsapi.aliyuncs.com");
+        request.setSysVersion("2017-05-25");
+        request.setSysAction("SendSms");
+        request.putQueryParameter("RegionId", region);
+        request.putQueryParameter("PhoneNumbers", userDtos.get(0).getTel());
+        request.putQueryParameter("SignName", signName);
+        request.putQueryParameter("TemplateCode", templateCode);
+
+
+        JSONObject param = new JSONObject();
+        param.put("repairId", content.getString("repairId"));
+        request.putQueryParameter("TemplateParam", param.toString());
+
+        String resParam = "";
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            logger.debug("发送验证码信息：{}", response.getData());
+            resParam = response.getData();
+        } catch (Exception e) {
+            e.printStackTrace();
+            resParam = e.getMessage();
+            throw new IllegalArgumentException("短信工单失败" + e.getMessage());
+        } finally {
+            LogFactory.saveOutLog("SMS", param.toString(), new ResponseEntity(resParam, HttpStatus.OK));
+        }
+        return new ResultVo(ResultVo.CODE_OK, "成功");
     }
 
     @Override