Merge remote-tracking branch 'origin/main'

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -25,6 +25,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/large/check")
@@ -98,13 +99,15 @@ public class PlatProjectCheckController extends BaseController {
      * 更改问题状态
      * */
     @PostMapping("/changeIssueStatus")
-    public AjaxResult changeIssueStatus(@RequestPart("issue") LargeIssue entity, @RequestPart(value = "file") MultipartFile file) {
+    public AjaxResult changeIssueStatus(@RequestPart("issue") LargeIssue entity, @RequestPart(value = "file",required = false) MultipartFile file) {
         try {
-            // 上传文件路径
-            String filePath = ProjectConfig.getUploadPath();
-            // 上传并返回新文件名称
-            String fileName = FileUploadUtils.upload(filePath, file);
-            entity.setImagePath("/uploadPath" + fileName.substring(8));
+            if (Objects.nonNull(file)) {
+                // 上传文件路径
+                String filePath = ProjectConfig.getUploadPath();
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                entity.setImagePath("/uploadPath" + fileName.substring(8));
+            }
         }catch (Exception e){
         }
         return toAjax(largeIssueService.updateById(entity));

project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatBuildingServiceImpl.java

@@ -707,15 +707,10 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         String result = platBuildingMapper.getPhotovoltaicPower();
         if (StringUtils.isBlank(result)){
             result = "{\n" +
-                    "    \"code\": 200,\n" +
-                    "    \"success\": true,\n" +
-                    "    \"data\": {\n" +
                     "        \"sum\":\"0\",\n" +
                     "        \"bm\":\"0\",\n" +
                     "        \"gfb\":\"0\"\n" +
-                    "    },\n" +
-                    "    \"msg\": \"成功。\"\n" +
-                    "}";
+                    "    }";
         }
         return JSONObject.parseObject(result);
     }

project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartSafetyServiceImpl.java

@@ -175,7 +175,7 @@ public class PlatGreenSmartSafetyServiceImpl extends ServiceImpl<PlatGreenSmartS
     @Override
     @Transactional
     public void addPlatGreenSmartSafety(String appOrg, Map<String, Object> mapField){
-        List<String> keyList = Arrays.asList("name","sample","positive","negative","Ingredients","LeaveSample");
+        List<String> keyList = Arrays.asList("name","sample","positive","negative","ingredients","leaveSample");
         // 先删除所有数据
         LambdaQueryWrapper<PlatGreenSmartSafety> lqw = new LambdaQueryWrapper<>();
         lqw.eq(PlatGreenSmartSafety::getAppOrg, appOrg);

project-zcustom/src/main/resources/mapper/zcustom/basics/PlatAppOrgMapper.xml

@@ -42,8 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             c.del_flag = 0
         <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
-        GROUP BY
-            c.id
+        GROUP BY c.id order by cameraNum desc
     </select>
 
     <select id="getConnectUnitNum" resultType="int">

uploadPath/cert/ins_pub_key.txt

@@ -1 +0,0 @@
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSP0AhW299Ip+X7NLftJppkOY7prFovuNFblF81XoHLVU18kVlH7WxG08DdW6eAZ30+nuh9Nj3BK9o+eo+DQhPu5KgUC7pk/aUA/wMqb2eCGjHAnyWYqNWmWT3hrzBuVLnh2D83Qlk14JAelBvpa8JcIVHywB61QHa+q8fvUFD0wIDAQAB

uploadPath/cert/pri_key.txt

@@ -1 +0,0 @@
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCI7OcthFavyw2TQsh57ryX1FtR3abJ7VfMbe0HXH44L1NRRvWmfNz3K13Gi5qgwbwmS02mAlZgVcOjEDHVb28cgKkvW/zxODJDm1JSwtoVfeIHnJ0Q7yqplqZkeZ+mriOO6nv/LfYq2JfX4S5jrPxP3Ogx3LSSlVPi/7lTvK9ewoOyM8SiW+DlovqIL9yhN5OEpyljXX0SNY89EGNLvsi2WYldA7WjrFod4TwKvbMdXx0XNdXLMZkMj4Q4NX9TFoqoJwhPJ16tK7qK5CpYmgKCRE8lP2L5gSuTNLs+riNvoLsPYXe6y9QOBkBmoz3Ebkf5KBK5Vk8nHfvyJ4KwwdGxAgMBAAECggEAcGY4Z27pUilXHXmG5EEL437Y790J21zP4+qg1pggrLJ8rI2ZfW+mW+fndOKIrkoazzylow7sJOyCSksy/UgaZ8VeHJhgjQtah5DrBTEaoOXTM/hmHs6VsN0P/g6w9byhR+JIo3LxTr659ubMk9oezNhEaxoHyQR39jGByrFrLFdADFKazfvacJDQVDDNvUZVu/O2YquXQi3gVMIgBIVDZEEIWrJs6qc0oedM9CWQvTw2wVNRyhXKuxL/bWnS0C0UkGLtI8OGCl2kOrB5MuWTDp62L9IBufvkUamt49MWk6/cyCfpfgWww63e2kaFnjQx/KW+U2ZM9k+WGf2zr5AYoQKBgQDMA9txMolS8w6GNi8pMFAmIzu7AAWLnXIz3/SZAzIp7HE2V3P1L2RwGD7peoEAOacBtpm3/s1mk7m6zsgqAwE8SrC/mK2c5W47xk03R8XX/xlEcMBq2LG8Fgsb3h+4UeFL0Mpp057XhVrXbDhvtc/FifvFZ43l2cgUSgpC+BhSzQKBgQCr0LVGHp6eJMbLpPBQF4J7+ndrzp7FCA24j7y9R61ZlTC8pMJzfASJXuoFJ3OZPyeeX2kK3Lv1tflg1g8CJJ6FF0HH0dWFhzJmc0DZVaSjUkBdomcwLw8mo0Tc0mKvfiTsJ/bzOhoZz7iZJLk+xiNRydf0/tkX0szu32ZhNLfidQKBgQCAIuQPAtixWquCrEGOsyOD8JkxaGATQn5aCo2MFS/KmRC6Os8/7dY9eVz6M9EWHR/BubhukgDcLmh25i1eBake/yJoFDLm2ksUDAavc8rVUQnDrLWN5jArnAS6KhbuI69HeQnI0ftwDffyWaxQrXaj8XhKkjHTbad25tHvIffU+QKBgGaJwCWA0JkAycNvRBwIa88hw3OLdCWSkN28qp8rz8DO0K9EhOf2854oDvHUgaDLmBFkT4Q0B9i0KYgpN/vHbvNu1csy54MxFFsgHWuXORJfXBqFeZ+/9gLRHZ/Lzyl81vw5PaAa5MjStxBuYj+ccCe3ljKYhWc6XyOQH8GTfMqhAoGAPahCdLkoKh5V3rKYj0QCONer9KM+yl3olgKvpGY9+tq9+NP7g0o0jKphQwsIymaAxzFwYEZvLmZKF7OGUtvEwuzWBOMuGz5vrIANuUTu6WbsSEDcSG1pU98j8f/CJtCC9V4aSeHPU+dWokcoZnwou+pZCOOXY3PCwzKguE9uhVk=

uploadPath/cert/pub_key.txt

@@ -1 +0,0 @@
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiOznLYRWr8sNk0LIee68l9RbUd2mye1XzG3tB1x+OC9TUUb1pnzc9ytdxouaoMG8JktNpgJWYFXDoxAx1W9vHICpL1v88TgyQ5tSUsLaFX3iB5ydEO8qqZamZHmfpq4jjup7/y32KtiX1+EuY6z8T9zoMdy0kpVT4v+5U7yvXsKDsjPEolvg5aL6iC/coTeThKcpY119EjWPPRBjS77ItlmJXQO1o6xaHeE8Cr2zHV8dFzXVyzGZDI+EODV/UxaKqCcITyderSu6iuQqWJoCgkRPJT9i+YErkzS7Pq4jb6C7D2F3usvUDgZAZqM9xG5H+SgSuVZPJx378ieCsMHRsQIDAQAB