Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-18 044a784761b5a7c43c227871d92e3d0d275bcaff

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/java/com/dg/core/AliyunConfig.java

@@ -30,6 +30,17 @@
    private  String  TemplateCodeComplete;


    @Value("${aliyun.TemplateCodeSubmit}")
    private  String  TemplateCodeSubmit;

    public String getTemplateCodeSubmit() {
        return TemplateCodeSubmit;
    }

    public void setTemplateCodeSubmit(String templateCodeSubmit) {
        TemplateCodeSubmit = templateCodeSubmit;
    }

    public String getKey() {
        return key;
    }

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -107,7 +107,7 @@
                    GuideEvolveEntity entity = new GuideEvolveEntity();
                    entity.setCreateTime(LocalDateTime.now());
                    entity.setUpdateTime(LocalDateTime.now());
                    entity.setState("10");
                    entity.setState("8");
                    entity.setDepartmentalId(sysUser.getDepartmentId());
                    entity.setToUserId(guideRepairOrder.getGuideUserId() + "");
                    entity.setFromUserId(guideRepairOrder.getSubmitUserId());
@@ -118,6 +118,8 @@
                    //超时时间设置业务结束
                    //消息推送
                    this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
                    //短信发送
                    smsUtil.sendSmsSubmit(sysUser.getPhonenumber(),sysUser.getUserName());
                    guideEvolveMapper.insertConfig(entity);
                }
            } else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -221,6 +223,8 @@
            if (guideRepairOrder!=null){
                this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
            }
            //短信发送
            smsUtil.sendSmsSubmit(sysUser.getPhonenumber(),sysUser.getUserName());
            sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
            return sysUserMapper.updateById(sysUser);
        } else if (order.getState().equals("10")) {
@@ -231,6 +235,8 @@
            sysUserMapper.updateById(sysUserFrom);
            GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
                    .eq(GuideRepairOrder::getId, order.getGuideId()));
            //短信发送
            smsUtil.sendSmsSubmit(sysUserTo.getPhonenumber(),sysUserTo.getUserName());
            if (guideRepairOrder!=null){
                this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(),guideRepairOrder);
            }

 flower_city/src/main/java/com/dg/core/util/SmsUtil.java

@@ -187,4 +187,55 @@
        }
        return ResultData.error("短信发送失败");
    }


    /**
     * 发送工单提交短信
     *
     * @param tel
     *            电话
     * @param name
     *            工单名
     */
    public ResultData<Object> sendSmsSubmit(String tel,String name) {
        //cn-hangzhou 是阿里定义的签名固定值。填写阿里云申请短信签名的key和secret值
        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getKey(), aliyunConfig.getScrect());
        /*阿里云提供的短信发送api的近期的相关代码，代码以最新的阿里api提供为准*/
        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", "cn-hangzhou");
        //  接收人电话
        request.putQueryParameter("PhoneNumbers", tel);
        //  短信签名
        request.putQueryParameter("SignName", "集慧科技");
        //  短信模板
        request.putQueryParameter("TemplateCode", aliyunConfig.getTemplateCodeSubmit());
        Random rd = new Random();
        //  短信内容
        request.putQueryParameter("TemplateParam", "{name:'" + name + "'}");
        //  获取短信发送的响应结果
        try {
            CommonResponse rs = client.getCommonResponse(request);
            LOGGER.debug(rs.getData().toString());
            // 把json格式的字符串装换成java的map的数据类型
            ObjectMapper mapper = new ObjectMapper();
            try {
                HashMap<String, Object> m = mapper.readValue(rs.getData().toString(), HashMap.class);
                if (m.get("Message").equals("OK")) {
                    return  ResultData.success("短信发送成功!");
                }
            } catch (JsonProcessingException e) {
                e.printStackTrace();
                return ResultData.error("短信发送失败");
            }
        } catch (ClientException e) {
            e.printStackTrace();
            return ResultData.error("短信发送失败");
        }
        return ResultData.error("短信发送失败");
    }
}

 flower_city/src/main/resources/application-sms.properties

@@ -5,6 +5,7 @@
aliyun.TemplateCode=SMS_254326275
aliyun.TemplateCodeOvertime=SMS_254460011
aliyun.TemplateCodeComplete=SMS_254875101
aliyun.TemplateCodeSubmit=SMS_254880764




 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -55,7 +55,7 @@
            consult_user_name,
            concat((select user_name from automessage_sys_user where a.submit_user_id=user_id ), submit_user_phone) submitUser,
            submit_user_id,
            concat((select user_name from automessage_sys_user where a.guide_user_id=user_id ), guide_user_phone) guideUser,
            concat((IFNULL((select user_name from automessage_sys_user where a.guide_user_id=user_id ),'')), (ifnull(guide_user_phone,''))) guideUser,
            guide_user_id,
            (select organization_name from automessage_organization_chart where a.guide_department_id=id)guideDepartmentName,
            guide_department_id,

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -356,7 +356,7 @@
        order by create_time desc
    </select>

     <select id="sumTransactionNum"  resultMap="TransactionEventEntityResult">
    <select id="sumTransactionNum"  resultMap="TransactionEventEntityResult">
        select sum(transaction_num)sumTransactionNum,count(*) counttransaction   FROM automessage_transaction_event
    </select>

@@ -413,13 +413,12 @@

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select distinct   classify_id, content, type   FROM(
                                                               select id,classify_name title,ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content,id classify_id,4 type  from automessage_classify_administration c UNION
           select id,classify_name title,ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content,id classify_id,4 type  from automessage_classify_administration c UNION

                                                               select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                                                                    where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                                                                   '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,classify_id,
                                                                       2 type from automessage_transaction_event
                                                           ) k
           select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                               '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,classify_id,
                   2 type from automessage_transaction_event) k
        where  k.title like concat('%',#{keyWord}, '%')
    </select>

@@ -435,8 +434,6 @@
                    (select ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content  from automessage_classify_administration c where c.id=t.classify_id) content,
                    3 type from automessage_transaction_event t where  associate_names like  concat('%',#{keyWord}, '%')
    </select>



    <select id="selectDataIfExist" resultType="string">
        select id from automessage_transaction_event