修复安全环保检查检查情况搜索框不好使的问题

升级hutool版本

pom.xml

@@ -459,7 +459,7 @@
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
-			<version>5.0.5</version>
+			<version>5.8.16</version>
 		</dependency>
 
 		<dependency>

src/main/java/com/zcloud/controller/app/AppHiddenController.java

@@ -1,5 +1,6 @@
 package com.zcloud.controller.app;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -552,7 +553,7 @@ public class AppHiddenController extends BaseController {
 		}
 		File tempFile = new File(file.getOriginalFilename());
 		FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
-		String md5 = DigestUtil.md5Hex(tempFile);
+		String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
 		if (!FileUpload.isImage(tempFile)) {
 			tempFile.delete();
 			map.put("result", "failed");

src/main/java/com/zcloud/controller/app/AppImgFilesController.java

@@ -1,5 +1,6 @@
 package com.zcloud.controller.app;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
@@ -33,329 +34,349 @@ import java.util.Map;
 @RequestMapping("/app/imgfiles")
 public class AppImgFilesController extends BaseController {
 
-	@Autowired
-	private ImgFilesService imgfilesService;
+    @Autowired
+    private ImgFilesService imgfilesService;
 
-	/**完成
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/add", headers = "content-type=multipart/form-data")
-	@ResponseBody
-	@Transactional
-	public Object finish(
-			@RequestParam(value="FFILE",required=false) MultipartFile[] files,
-			@RequestParam(value="TYPE",required=false) String TYPE,
-			@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY
-			) throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
+    /**
+     * 完成
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
+    @ResponseBody
+    @Transactional
+    public Object finish(
+            @RequestParam(value = "FFILE", required = false) MultipartFile[] files,
+            @RequestParam(value = "TYPE", required = false) String TYPE,
+            @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
+    ) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
         if (files != null && files.length > 0) {
-			for (int i = 0; i < files.length; i++) {
-				String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
-				if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
-					errInfo = "fail";
-					map.put("result", errInfo);
-					map.put("msg", "文件格式不正确！");
-					return map;
-				}
-			}
+            for (int i = 0; i < files.length; i++) {
+                String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
+                if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
+                    errInfo = "fail";
+                    map.put("result", errInfo);
+                    map.put("msg", "文件格式不正确！");
+                    return map;
+                }
+            }
             for (int i = 0; i < files.length; i++) {
                 MultipartFile file = files[i];
 //                 保存文件
                 File tempFile = new File(file.getOriginalFilename());
-				String md5 = DigestUtil.md5Hex(tempFile);
-        		FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
-        		if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
-					tempFile.delete();
-					map.put("result", "failed");
-					map.put("exception", "上传图片格式不正确，请重新上传");
-					return map;
-				}
-				if (tempFile.exists()) {
-					tempFile.delete();
-				}
+                FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
+                String md5 = FileUtil.isEmpty(tempFile) ? "" : DigestUtil.md5Hex(tempFile);
+                if (!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("102")) {//四色图改为json文件,不用判断类型
+                    tempFile.delete();
+                    map.put("result", "failed");
+                    map.put("exception", "上传图片格式不正确，请重新上传");
+                    return map;
+                }
+                if (tempFile.exists()) {
+                    tempFile.delete();
+                }
 
-        		if(TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图
-        			PageData pd2 = new PageData();
-        			pd2.put("FOREIGN_KEY",FOREIGN_KEY);
-        			pd2.put("TYPE",TYPE);
-        			List<PageData> four = imgfilesService.listAll(pd2);
-        			for (PageData pageData : four) {
-        				File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH"));
-        				old.delete();
-        				imgfilesService.delete(pageData);
-					}
-        		}
-        		PageData pd = new PageData();
-        		pd = this.getPageData();
-        		String  ffile = DateUtil.getDays();
+                if (TYPE.equals("2") || TYPE.equals("102")) {//先删除原四色图
+                    PageData pd2 = new PageData();
+                    pd2.put("FOREIGN_KEY", FOREIGN_KEY);
+                    pd2.put("TYPE", TYPE);
+                    List<PageData> four = imgfilesService.listAll(pd2);
+                    for (PageData pageData : four) {
+                        File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
+                        old.delete();
+                        imgfilesService.delete(pageData);
+                    }
+                }
+                PageData pd = new PageData();
+                pd = this.getPageData();
+                String ffile = DateUtil.getDays();
 //        		String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile;	//文件上传路径
 //        		String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
-        		String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-        		Smb.sshSftp(file, fileName,Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
+                String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+                Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
 
-        		pd.put("IMGFILES_ID",  this.get32UUID());
-        		pd.put("FILEPATH",  Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
-        		pd.put("TYPE", TYPE);
-				pd.put("MD5", md5);
-        		pd.put("FOREIGN_KEY",  FOREIGN_KEY);
-        		imgfilesService.save(pd);
+                pd.put("IMGFILES_ID", this.get32UUID());
+                pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+                pd.put("TYPE", TYPE);
+                pd.put("MD5", md5);
+                pd.put("FOREIGN_KEY", FOREIGN_KEY);
+                imgfilesService.save(pd);
             }
         }
 
-		map.put("result", errInfo);
-		return map;
-	}
+        map.put("result", errInfo);
+        return map;
+    }
 
 
-	/**新增
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/add64")
-	@ResponseBody
-	public Object add64() throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("FILEPATH"));
-		String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
-		if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
-			errInfo = "fail";
-			map.put("result", errInfo);
-			map.put("msg", "文件格式不正确！");
-			return map;
-		}
-		String  ffile = DateUtil.getDays();
-		String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
-		Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
-		pd.put("FILEPATH",  Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
-		pd.put("IMGFILES_ID",  this.get32UUID());
-		pd.put("TYPE", pd.getString("TYPE"));
-		pd.put("FOREIGN_KEY",  pd.getString("FOREIGN_KEY"));
-		imgfilesService.save(pd);
-		map.put("pd", pd);
-		map.put("result", errInfo);
-		return map;
-	}
+    /**
+     * 新增
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/add64")
+    @ResponseBody
+    public Object add64() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("FILEPATH"));
+        String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
+        if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
+            errInfo = "fail";
+            map.put("result", errInfo);
+            map.put("msg", "文件格式不正确！");
+            return map;
+        }
+        String ffile = DateUtil.getDays();
+        String fileName = this.get32UUID() + img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
+        Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
+        pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+        pd.put("IMGFILES_ID", this.get32UUID());
+        pd.put("TYPE", pd.getString("TYPE"));
+        pd.put("FOREIGN_KEY", pd.getString("FOREIGN_KEY"));
+        imgfilesService.save(pd);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
 
 
-	/**完成
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/edit", headers = "content-type=multipart/form-data")
-	@ResponseBody
-	@Transactional
-	public Object edit(
-			@RequestParam(value="FFILE",required=false) MultipartFile[] files,
-			@RequestParam(value="TYPE",required=false) String TYPE,
-			@RequestParam(value="FOREIGN_KEY",required=false) String FOREIGN_KEY
-			) throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
+    /**
+     * 完成
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/edit", headers = "content-type=multipart/form-data")
+    @ResponseBody
+    @Transactional
+    public Object edit(
+            @RequestParam(value = "FFILE", required = false) MultipartFile[] files,
+            @RequestParam(value = "TYPE", required = false) String TYPE,
+            @RequestParam(value = "FOREIGN_KEY", required = false) String FOREIGN_KEY
+    ) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
         if (files != null && files.length > 0) {
-			for (int i = 0; i < files.length; i++) {
-				String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
-				if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
-					errInfo = "fail";
-					map.put("result", errInfo);
-					map.put("msg", "文件格式不正确！");
-					return map;
-				}
-			}
-			PageData pd2 = new PageData();
-			pd2.put("FOREIGN_KEY",FOREIGN_KEY);
-			pd2.put("TYPE",TYPE);
-			List<PageData> four = imgfilesService.listAll(pd2);
-			for (PageData pageData : four) {
-				File old = new File(PathUtil.getProjectpath()+pageData.getString("FILEPATH"));
-				old.delete();
-				imgfilesService.delete(pageData);
-			}
+            for (int i = 0; i < files.length; i++) {
+                String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
+                if (!"json".equals(suffixName) && !"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
+                    errInfo = "fail";
+                    map.put("result", errInfo);
+                    map.put("msg", "文件格式不正确！");
+                    return map;
+                }
+            }
+            PageData pd2 = new PageData();
+            pd2.put("FOREIGN_KEY", FOREIGN_KEY);
+            pd2.put("TYPE", TYPE);
+            List<PageData> four = imgfilesService.listAll(pd2);
+            for (PageData pageData : four) {
+                File old = new File(PathUtil.getProjectpath() + pageData.getString("FILEPATH"));
+                old.delete();
+                imgfilesService.delete(pageData);
+            }
             for (int i = 0; i < files.length; i++) {
                 MultipartFile file = files[i];
 //                 保存文件
                 File tempFile = new File(file.getOriginalFilename());
-        		FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
-        		if(!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
-					tempFile.delete();
-					map.put("result", "failed");
-					map.put("exception", "上传图片格式不正确，请重新上传");
-					return map;
-				}
-				if (tempFile.exists()) {
-					tempFile.delete();
-				}
-        		PageData pd = new PageData();
-        		pd = this.getPageData();
-        		String  ffile = DateUtil.getDays();
+                FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
+                if (!FileUpload.isImage(tempFile) && !TYPE.equals("2")) {//四色图改为json文件,不用判断类型
+                    tempFile.delete();
+                    map.put("result", "failed");
+                    map.put("exception", "上传图片格式不正确，请重新上传");
+                    return map;
+                }
+                if (tempFile.exists()) {
+                    tempFile.delete();
+                }
+                PageData pd = new PageData();
+                pd = this.getPageData();
+                String ffile = DateUtil.getDays();
 //        		String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile;	//文件上传路径
 //        		String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
-        		String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-        		Smb.sshSftp(file, fileName,Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
+                String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+                Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
 
-        		pd.put("IMGFILES_ID",  this.get32UUID());
-        		pd.put("FILEPATH",  Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
-        		pd.put("TYPE", TYPE);
-        		pd.put("FOREIGN_KEY",  FOREIGN_KEY);
-        		imgfilesService.save(pd);
+                pd.put("IMGFILES_ID", this.get32UUID());
+                pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
+                pd.put("TYPE", TYPE);
+                pd.put("FOREIGN_KEY", FOREIGN_KEY);
+                imgfilesService.save(pd);
             }
         }
 
-		map.put("result", errInfo);
-		return map;
-	}
+        map.put("result", errInfo);
+        return map;
+    }
 
-	/**删除
-	 * @param out
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/delete")
-	@ResponseBody
-	public Object delete() throws Exception{
-		Map<String,String> map = new HashMap<String,String>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		pd = imgfilesService.findById(pd);	//根据ID读取
-		File file = new File(PathUtil.getProjectpath()+pd.getString("FILEPATH"));
-		file.delete();
-		imgfilesService.delete(pd);
-		map.put("result", errInfo);				//返回结果
-		return map;
-	}
+    /**
+     * 删除
+     *
+     * @param out
+     * @throws Exception
+     */
+    @RequestMapping(value = "/delete")
+    @ResponseBody
+    public Object delete() throws Exception {
+        Map<String, String> map = new HashMap<String, String>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = imgfilesService.findById(pd);    //根据ID读取
+        File file = new File(PathUtil.getProjectpath() + pd.getString("FILEPATH"));
+        file.delete();
+        imgfilesService.delete(pd);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
 
-	/**修改
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/edit")
-	@RequiresPermissions("imgfiles:edit")
-	@ResponseBody
-	public Object edit() throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		imgfilesService.edit(pd);
-		map.put("result", errInfo);
-		return map;
-	}
+    /**
+     * 修改
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/edit")
+    @RequiresPermissions("imgfiles:edit")
+    @ResponseBody
+    public Object edit() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        imgfilesService.edit(pd);
+        map.put("result", errInfo);
+        return map;
+    }
 
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/list")
-	@RequiresPermissions("imgfiles:list")
-	@ResponseBody
-	public Object list(Page page) throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
-		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
-		page.setPd(pd);
-		List<PageData>	varList = imgfilesService.list(page);	//列出ImgFiles列表
-		map.put("varList", varList);
-		map.put("page", page);
-		map.put("result", errInfo);
-		return map;
-	}
+    /**
+     * 列表
+     *
+     * @param page
+     * @throws Exception
+     */
+    @RequestMapping(value = "/list")
+    @RequiresPermissions("imgfiles:list")
+    @ResponseBody
+    public Object list(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String KEYWORDS = pd.getString("KEYWORDS");                        //关键词检索条件
+        if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData> varList = imgfilesService.list(page);    //列出ImgFiles列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
 
-	 /**去修改页面获取数据
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/goEdit")
-	@RequiresPermissions("imgfiles:edit")
-	@ResponseBody
-	public Object goEdit() throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		pd = imgfilesService.findById(pd);	//根据ID读取
-		map.put("pd", pd);
-		map.put("result", errInfo);
-		return map;
-	}
+    /**
+     * 去修改页面获取数据
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/goEdit")
+    @RequiresPermissions("imgfiles:edit")
+    @ResponseBody
+    public Object goEdit() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = imgfilesService.findById(pd);    //根据ID读取
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
 
-	 /**批量删除
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/deleteAll")
-	@RequiresPermissions("imgfiles:del")
-	@ResponseBody
-	public Object deleteAll() throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		String DATA_IDS = pd.getString("DATA_IDS");
-		if(Tools.notEmpty(DATA_IDS)){
-			String ArrayDATA_IDS[] = DATA_IDS.split(",");
-			imgfilesService.deleteAll(ArrayDATA_IDS);
-			errInfo = "success";
-		}else{
-			errInfo = "fail";
-		}
-		map.put("result", errInfo);				//返回结果
-		return map;
-	}
+    /**
+     * 批量删除
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/deleteAll")
+    @RequiresPermissions("imgfiles:del")
+    @ResponseBody
+    public Object deleteAll() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DATA_IDS = pd.getString("DATA_IDS");
+        if (Tools.notEmpty(DATA_IDS)) {
+            String ArrayDATA_IDS[] = DATA_IDS.split(",");
+            imgfilesService.deleteAll(ArrayDATA_IDS);
+            errInfo = "success";
+        } else {
+            errInfo = "fail";
+        }
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
 
-	 /**导出到excel
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/excel")
-	@RequiresPermissions("toExcel")
-	public ModelAndView exportExcel() throws Exception{
-		ModelAndView mv = new ModelAndView();
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		Map<String,Object> dataMap = new HashMap<String,Object>();
-		List<String> titles = new ArrayList<String>();
-		titles.add("路径");	//1
-		titles.add("类型");	//2
-		titles.add("外键");	//3
-		dataMap.put("titles", titles);
-		List<PageData> varOList = imgfilesService.listAll(pd);
-		List<PageData> varList = new ArrayList<PageData>();
-		for(int i=0;i<varOList.size();i++){
-			PageData vpd = new PageData();
-			vpd.put("var1", varOList.get(i).getString("FILEPATH"));	    //1
-			vpd.put("var2", varOList.get(i).get("TYPE").toString());	//2
-			vpd.put("var3", varOList.get(i).getString("FOREIGN_KEY"));	    //3
-			varList.add(vpd);
-		}
-		dataMap.put("varList", varList);
-		ObjectExcelView erv = new ObjectExcelView();
-		mv = new ModelAndView(erv,dataMap);
-		return mv;
-	}
+    /**
+     * 导出到excel
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/excel")
+    @RequiresPermissions("toExcel")
+    public ModelAndView exportExcel() throws Exception {
+        ModelAndView mv = new ModelAndView();
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        List<String> titles = new ArrayList<String>();
+        titles.add("路径");    //1
+        titles.add("类型");    //2
+        titles.add("外键");    //3
+        dataMap.put("titles", titles);
+        List<PageData> varOList = imgfilesService.listAll(pd);
+        List<PageData> varList = new ArrayList<PageData>();
+        for (int i = 0; i < varOList.size(); i++) {
+            PageData vpd = new PageData();
+            vpd.put("var1", varOList.get(i).getString("FILEPATH"));        //1
+            vpd.put("var2", varOList.get(i).get("TYPE").toString());    //2
+            vpd.put("var3", varOList.get(i).getString("FOREIGN_KEY"));        //3
+            varList.add(vpd);
+        }
+        dataMap.put("varList", varList);
+        ObjectExcelView erv = new ObjectExcelView();
+        mv = new ModelAndView(erv, dataMap);
+        return mv;
+    }
 
 
-	 /**查询图片集合
-	 * @param
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/listImgs")
-	@ResponseBody
-	public Object listImgs() throws Exception{
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		PageData pd = new PageData();
-		pd = this.getPageData();
-		List<PageData> imgs  = imgfilesService.listAll(pd);	//根据ID读取
-		map.put("imgs", imgs);
-		map.put("result", errInfo);
-		return map;
-	}
+    /**
+     * 查询图片集合
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listImgs")
+    @ResponseBody
+    public Object listImgs() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> imgs = imgfilesService.listAll(pd);    //根据ID读取
+        map.put("imgs", imgs);
+        map.put("result", errInfo);
+        return map;
+    }
 
 }

src/main/java/com/zcloud/controller/system/LoginController.java

@@ -153,7 +153,6 @@ public class LoginController extends BaseController {
             } catch (AuthenticationException ae) {
                 errInfo = "usererror";
             }
-            Integer port = SpringUtil.getApplicationContext().getEnvironment().getProperty("server.port", Integer.class);
             if (subject.isAuthenticated()) {                            //验证是否登录成功
                 removeSession(USERNAME);
 
@@ -178,8 +177,7 @@ public class LoginController extends BaseController {
                         if (backEndPath.get("result").toString().equals("success")) {
                             backEndPath.put("baseImgPath",map.get("baseImgPath").toString());
                             backEndPath.put("USER_IDENTITY",map.get("USER_IDENTITY").toString());
-
-                            backEndPath.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
+                            backEndPath.put("BACKENDADDR", map.get("BACKENDADDR").toString());
                             System.out.println("登录返回参数：" + backEndPath);
                             return backEndPath;
                         } else {
@@ -190,7 +188,6 @@ public class LoginController extends BaseController {
                             return map;
                         }
                     }
-                    map.put("BACKENDADDR", "http://" + ip + ":" + port + "/");
                     if ("99".equals(pd.getString("STATUS"))) {
                         errInfo = "userlock";
                         map.put("result", "fail");
@@ -511,4 +508,4 @@ public class LoginController extends BaseController {
 //			pd.put("ArrayDATA_IDS", a);
 //		}
 //	}
-}
+}

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -575,8 +575,8 @@ public class UsersController extends BaseController {
             usersService.resetCardNo(pd);
         }
         //每次人员信息更改都要将人物状态置为未推送且不可查询，需推送后在进行使用
-        pd.put("ISDELETE","1");
-        pd.put("ISPUSH","0");
+//        pd.put("ISDELETE","1");
+//        pd.put("ISPUSH","0");
         usersService.editUser(pd);    //执行修改
         if ("true".equals(pd.getString("ISSTUDENT"))) {
             pd.put("IS_ONLINELEARNING", "1");
@@ -1027,6 +1027,7 @@ public class UsersController extends BaseController {
             PageData userPd = new PageData();
             userPd.put("USER_ID",ID);
             PageData userinfo = usersService.findById(userPd);
+            userinfo.put("PHONE",userinfo.get("USERNAME"));
             userinfo.put("ISDELETE","0");
             map.put("USERINFO", userinfo);
             map.put("USER_ID",ID);

src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java

@@ -20,7 +20,7 @@ public class MessagesServiceImpl implements MessagesService {
 
     private final MessagesMapper mapper;
     private final Map<String, PushMessages> messages;
-    
+
     @Override
     public void push(PushRecords pushRecords) throws Exception {
         // 先记录数据

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml

@@ -207,8 +207,11 @@
         </if>
         GROUP BY se.INSPECTION_ID
         ORDER BY FIELD(se.INSPECTION_STATUS, '2', '1', '0', '3', '4', '5', '6', '7', '8', '-1', '-2'),
-                 FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},se.INSPECTED_SITEUSER_ID,'1'), se.INSPECTED_SITEUSER_ID, '1'),
-                 se.INSPECTION_TIME_START DESC
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId}, se.INSPECTED_SITEUSER_ID, '1'),
+                  se.INSPECTED_SITEUSER_ID, '1'),
+        </if>
+        se.INSPECTION_TIME_START DESC
     </select>
 
 	<!-- 列表(全部) -->

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml

@@ -122,84 +122,101 @@
 
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		iou.NAME INSPECTION_ORIGINATOR_NAME,
-		iod.NAME INSPECTION_DEPARTMENT_NAME,
-		isd.NAME INSPECTED_DEPARTMENT_NAME,
-		isu.NAME INSPECTED_SITEUSER_NAME,
-		IFNULL(GROUP_CONCAT(REPLACE(siu.NAME,'/',',')),'') AS INSPECTION_USER_NAME,
-		CASE WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME ELSE se.INSPECTION_TYPE_OTHER END INSPECTION_TYPE_NAME,
-		se.INSPECTION_TIME_START,
-		se.INSPECTION_TIME_END,
-		se.INSPECTION_STATUS,
-		se.INSPECTION_SUBJECT,
-		se.INSPECTED_DEPARTMENT_ID,
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		 INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_ID
-		 LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID
-		 LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID
-		 LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID
-		 LEFT JOIN SYS_USER isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID
-		LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_ID = se.INSPECTION_ID
-		AND si.ISDELETE = '0'
-		LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
-		 LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE
-		where f.ISDELETE = '0' and se.ISDELETE = '0'
-		<if test="pd.supDeparIds != null and pd.supDeparIds != ''"><!-- 权限显示 -->
-			<choose>
-				<when test="pd.roleLevel == '0'">
-				</when>
-				<when test="pd.roleLevel == '1'">
-					and siu.DEPARTMENT_ID in (${pd.supDeparIds})
-				</when>
-				<when test="pd.roleLevel == '3'">
---  					siu.USER_ID in ( #{pd.loginUserId} )
-				</when>
-			</choose>
-		</if>
-		<if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''"><!-- 检查人 -->
-			and f.INSPECTION_USER_ID = #{pd.INSPECTION_USER_ID}
-		</if>
-		<if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''"><!-- 检查题目 -->
-			and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR}
-		</if>
-		<if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''"><!-- 被检查单位 -->
-			and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''"><!-- 检查部门 -->
-			and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
-			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''"><!-- 检查类型 -->
-			and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
-		</if>
-		<if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''"><!-- 检查时间 -->
-			and se.INSPECTION_TIME_START &gt;= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00')
-		</if>
-		<if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''"><!-- 检查时间 -->
-			and se.INSPECTION_TIME_END &lt;= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59')
-		</if>
-		<if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''"><!-- 检查状态 -->
-			and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
-		</if>
+        select iou.NAME                                                 INSPECTION_ORIGINATOR_NAME,
+               iod.NAME                                                 INSPECTION_DEPARTMENT_NAME,
+               isd.NAME                                                 INSPECTED_DEPARTMENT_NAME,
+               isu.NAME                                                 INSPECTED_SITEUSER_NAME,
+               IFNULL(GROUP_CONCAT(REPLACE(siu.NAME, '/', ',')), '') AS INSPECTION_USER_NAME,
+               CASE
+                   WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME
+                   ELSE se.INSPECTION_TYPE_OTHER END                    INSPECTION_TYPE_NAME,
+               se.INSPECTION_TIME_START,
+               se.INSPECTION_TIME_END,
+               se.INSPECTION_STATUS,
+               se.INSPECTION_SUBJECT,
+               se.INSPECTED_DEPARTMENT_ID,
+        <include refid="Field">
+        </include>
+        from
+        <include refid="tableName">
+        </include>
+        f
+            INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_ID
+            LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID
+            LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID
+            LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID
+            LEFT JOIN SYS_USER isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID
+            LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_ID = se.INSPECTION_ID
+            AND si.ISDELETE = '0'
+            LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
+            LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE
+        where f.ISDELETE = '0'
+          and se.ISDELETE = '0'
+        <if test="pd.supDeparIds != null and pd.supDeparIds != ''">
+            <!-- 权限显示 -->
+            <choose>
+                <when test="pd.roleLevel == '0'">
+                </when>
+                <when test="pd.roleLevel == '1'">
+                    and siu.DEPARTMENT_ID in (${pd.supDeparIds})
+                </when>
+                <when test="pd.roleLevel == '3'">
+                    --  					siu.USER_ID in ( #{pd.loginUserId} )
+                </when>
+            </choose>
+        </if>
+        <if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''">
+            <!-- 检查人 -->
+            and f.INSPECTION_USER_ID = #{pd.INSPECTION_USER_ID}
+        </if>
+        <if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''">
+            <!-- 检查题目 -->
+            and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR}
+        </if>
+        <if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''">
+            <!-- 被检查单位 -->
+            and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''">
+            <!-- 检查部门 -->
+            and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''">
+            <!-- 检查发起人 -->
+            and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''">
+            <!-- 检查类型 -->
+            and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
+        </if>
+        <if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''">
+            <!-- 检查时间 -->
+            and se.INSPECTION_TIME_START &gt;= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00')
+        </if>
+        <if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''">
+            <!-- 检查时间 -->
+            and se.INSPECTION_TIME_END &lt;= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59')
+        </if>
+        <if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''">
+            <!-- 检查状态 -->
+            and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
+        </if>
 
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 被检查单位 -->
-			and (
-			isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-		GROUP BY f.INSPECTION_ID
-		ORDER BY
-		FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null,'2','1'), '1','2'),
-		FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},#{pd.loginUserId},'1'), #{pd.loginUserId}, '1'),
-		FIELD (se.INSPECTION_STATUS , '0','1','2','3','4','5','6','7','8','-1','-2') ,
-		se.INSPECTION_TIME_START DESC , se.INSPECTION_TIME_END DESC
-	</select>
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+            <!-- 被检查单位 -->
+            and (
+                isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%')
+                    OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%')
+                )
+        </if>
+        GROUP BY f.INSPECTION_ID
+        ORDER BY FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null, '2', '1'), '1', '2'),
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId}, #{pd.loginUserId}, '1'), #{pd.loginUserId}, '1'),
+        </if>
+        FIELD(se.INSPECTION_STATUS, '0', '1', '2', '3', '4', '5', '6', '7', '8', '-1', '-2'),
+        se.INSPECTION_TIME_START DESC, se.INSPECTION_TIME_END DESC
+    </select>
 
 	<!-- 列表(全部) -->
 	<select id="listAll" parameterType="pd" resultType="pd">

src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml

@@ -308,6 +308,9 @@
 		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
 			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
 		</if>
+		<if test="pd.INSPECTION_CASE != null and pd.INSPECTION_CASE != ''"><!-- 检查发起人 -->
+			and biss.SITUATION LIKE CONCAT('%', #{pd.INSPECTION_CASE},'%')
+		</if>
 		<if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''"><!-- 检查类型 -->
 			and f.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
 		</if>
@@ -339,16 +342,6 @@
 				OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			)
 		</if>
-		<!-- 2021/10/9  同步监管端搜索字段 -->
-		<if test="pd.INSPECTION_USER_NAME != null and pd.INSPECTION_USER_NAME != ''">
-			and REPLACE(siu.NAME,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_USER_PHONE != null and pd.INSPECTION_USER_PHONE != ''">
-			and REPLACE(siu.PHONE,'/',',') LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_USER_PHONE}),'%')
-		</if>
-		<if test="pd.INSPECTION_CASE != null and pd.INSPECTION_CASE != ''"><!-- 检查情况 -->
-			and biss.SITUATION like CONCAT('%', #{pd.INSPECTION_CASE}, '%')
-		</if>
 		GROUP BY f.INSPECTION_ID
 		ORDER BY f.CREATTIME DESC
 	</select>
@@ -675,6 +668,7 @@
                       ON si.INSPECTION_ID = f.INSPECTION_ID and si.ISDELETE = '0'
             LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
             LEFT JOIN sys_dictionaries d ON d.BIANMA = f.INSPECTION_TYPE
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
             LEFT JOIN (select h.FOREIGN_ID, count(h.HIDDEN_ID) as `count`
                        from BUS_HIDDEN h
                        where h.ISDELETE = 0
@@ -682,6 +676,7 @@
                          and h.STATE in ('4', '8')
                          and (h.FINAL_CHECK is null or h.FINAL_CHECK = '2')
                        group by h.FOREIGN_ID) h on h.FOREIGN_ID = f.INSPECTION_ID AND f.INSPECTION_STATUS in ('5', '6')
+        </if>
         where f.ISDELETE = '0'
         <if test="pd.INSPECTION_ORIGINATOR_ID != null and pd.INSPECTION_ORIGINATOR_ID != ''">
             <!-- 检查发起人 -->
@@ -746,13 +741,16 @@
                 )
         </if>
         GROUP BY f.INSPECTION_ID
-        ORDER BY CASE
-                     WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1
-                     WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2
-                     ELSE 3
-                     END,
-                 field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'),
-                 f.INSPECTION_TIME_END DESC
+        ORDER BY
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            CASE
+                WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1
+                WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2
+                ELSE 3
+                END,
+        </if>
+        field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'),
+        f.INSPECTION_TIME_END DESC
     </select>
 
 	<select id="statisticsBranchGroupDept" parameterType="pd" resultType="pd">