提交代码

ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java

@@ -837,7 +837,29 @@ public class LabourApiController extends BaseController {
     }
 
     public static void main(String[] args) {
-        pushLabourGroup();
+        String baseUrl = "https://szgc.jhncidg.com/jhapi";
+        String timestamp = String.valueOf(System.currentTimeMillis());
+        String appId = "jhcf17054840354615gUkkFJvTn003";
+        try {
+            // 明文信息->公钥加密
+            String encryptByPublicKeyStr = AuthRsaUtils.encryptByPublicKey(publicKey, appId+timestamp);
+            log.info("公钥加密...{}" , encryptByPublicKeyStr);
+            // redis中查询->未查询到则重新获取
+            String url = baseUrl + "/api/labour/v1/getToken";
+            Map<String, Object> body = new HashMap<>();
+            body.put("appId",appId);
+            body.put("sign",encryptByPublicKeyStr);
+            body.put("timestamp",timestamp);
+            String result = HttpClientUtil.doPost(url, null, com.alibaba.fastjson2.JSON.toJSONString(body));
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(jsonObject.getInteger("code")==200){
+                // 获取到存入redis，设置30分钟有效期
+                String token = jsonObject.getString("Authorization");
+                log.info("Authorization...{}" , token);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
 }

ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue

@@ -44,6 +44,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="整改人" prop="lordSent">
+        <el-input
+          v-model="queryParams.lordSent"
+          placeholder="请输入整改人姓名/联系方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="提交时间">
         <el-date-picker
           v-model="daterangeMarksTime"

ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="隐患分类" prop="createUser">
+      <el-form-item label="隐患分类" prop="roleTypes">
         <el-select v-model="queryParams.roleTypes" multiple placeholder="请选择隐患分类" clearable collapse-tags>
           <el-option
             v-for="dict in roleTypeOpts"
@@ -26,6 +26,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="整改人" prop="lordSent">
+        <el-input
+          v-model="queryParams.lordSent"
+          placeholder="请输入整改人姓名/联系方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="隐患描述" prop="workParts">
         <el-input
           v-model="queryParams.workParts"

ruoyi-wechat/src/main/java/com/ruoyi/web/common/CaptchaController.java

@@ -77,7 +77,6 @@ public class CaptchaController
             capStr = code = captchaProducer.createText();
             image = captchaProducer.createImage(capStr);
         }
-        System.out.println("CODE======================>>>>"+code);
         redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         // 转换流信息写出
         FastByteArrayOutputStream os = new FastByteArrayOutputStream();

yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="problemArea != null  and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
             <if test="workParts != null  and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
             <if test="changeInfo != null  and changeInfo != ''"> and ssp.changeInfo like concat('%', #{changeInfo}, '%')</if>
-            <if test="lordSent != null  and lordSent != ''"> and ssp.lordSent = #{lordSent}</if>
+            <if test="lordSent != null  and lordSent != ''"> and (ssp.lordSent like concat('%', #{lordSent}, '%') or ssp.lordSentUser like concat('%', #{lordSent}, '%'))</if>
             <if test="lordSentUser != null  and lordSentUser != ''"> and ssp.lordSentUser = #{lordSentUser}</if>
             <if test="copySend != null  and copySend != ''"> and ssp.copySend = #{copySend}</if>
             <if test="copySendUser != null  and copySendUser != ''"> and ssp.copySendUser = #{copySendUser}</if>