Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

src/main/java/com/steerinfo/ems/emsgmpcjh/service/impl/EmsGmPcJhServiceImpl.java

@@ -200,7 +200,7 @@ public class EmsGmPcJhServiceImpl extends BaseServiceImpl<EmsGmPcJh, String> imp
             String maxid = emsGmPcJhMapper.getMaxid(spp);
             String strh =maxid.substring(maxid.length() -2,maxid.length());
             Integer seq = Integer.parseInt(strh)+(i-1);
-            spp.setId(maxid.replace(strh,seq<10?"0"+seq.toString():seq.toString()));
+            spp.setId(maxid.replace("-"+strh,seq<10?"-0"+seq.toString():"-"+seq.toString()));
             spp.setState("0");
             spp.setCreateMan(payload.getUserName());
             spp.setCreateTime(new Date());

src/main/java/com/steerinfo/ems/emswebsocketlog/controller/EmsWebsocketLogController.java

@@ -47,6 +47,9 @@ public class EmsWebsocketLogController extends BaseRESTfulController {
     //@RequiresPermissions("emswebsocketlog:view")
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        if ( parmas.get("relation") != null && "admin".equals(parmas.get("relation").toString())) {
+            parmas.put("relation","");
+        }
         PageList<EmsWebsocketLog> list = emsWebsocketLogService.queryForPage(parmas, pageNum, pageSize);
         return success(list);
     }
@@ -59,6 +62,9 @@ public class EmsWebsocketLogController extends BaseRESTfulController {
     //@RequiresPermissions("emswebsocketlog:view")
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        if ( parmas.get("relation") != null && "admin".equals(parmas.get("relation").toString())) {
+            parmas.put("relation","");
+        }
         PageList<EmsWebsocketLog> list = emsWebsocketLogService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
@@ -110,4 +116,23 @@ public class EmsWebsocketLogController extends BaseRESTfulController {
     	}
       return success();
     }
+    @ApiOperation(value="更新详细信息", notes="根据根据传过来的emsWebsocketLog信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "emsWebsocketLog", value = "详细实体emsWebsocketLog", required = true, dataType = "EmsWebsocketLog")
+    })
+    @PutMapping(value = "/batchupdate", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult batchupdate(@RequestBody EmsWebsocketLog[] models) {
+        String userId = JwtUtil.getUseridByToken();
+        for (int i = 0; i < models.length; i++) {
+            EmsWebsocketLog model = models[i];
+            if (model.getId() == null || model.getId().equals("")) {
+                return failed(null, "id为空");
+            }
+            model.setState("1");
+            model.setClosetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+            model.setCloseman(JwtUtil.getUseridByToken());
+            emsWebsocketLogService.modify(model);
+        }
+        return success();
+    }
 }

src/main/java/com/steerinfo/ems/emswebsocketlog/mapper/EmsWebsocketLogMapper.xml

@@ -280,10 +280,12 @@
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
+    ORDER BY CREATETIME DESC
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
+    ORDER BY CREATETIME DESC
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into EMS_WEBSOCKET_LOG 

src/main/java/com/steerinfo/ftp/uploadfile/mapper/UploadFileMapper.xml

@@ -396,6 +396,6 @@
     t.ID,t.FILE_NAME,t.FILE_URL FROM SECURITY_TYPE s
     LEFT JOIN UPLOAD_FILE t ON s.ID = t.TYPE
     <include refid="whereLike"/>
-    order by CREATE_MAN
+    order by SECURITY_NODE,SEQNO,CREATE_MAN
   </select>
 </mapper>