安全隐患台账 照片上传

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/DataStatisticsController.java

@@ -34,17 +34,16 @@ public class DataStatisticsController {
 	@ApiOperation(value = "统计概览-检测项数量统计")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "type", value = "类型1:图 2:表", paramType = "query", dataType = "Integer"),
-			@ApiImplicitParam(name = "cycle", value = "统计周期1:本周 2:本月 3:本季度，4:本年", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String")
 	})
 	@GetMapping("/countByPhoto")
-	public R countByPhoto(Integer type, String TruckID, Integer cycle, String startDate, String endDate) {
+	public R countByPhoto(Integer type, String TruckID, String startDate, String endDate) {
 		Rcode.NOT_PARAM.assertNotNull(type);
 		if(type == 1){
-			return dataStatisticsService.countByPhoto(TruckID, cycle, startDate, endDate);
+			return dataStatisticsService.countByPhoto(TruckID, startDate, endDate);
 		}else if(type == 2){
-			return dataStatisticsService.countByTable(TruckID, cycle, startDate, endDate);
+			return dataStatisticsService.countByTable(TruckID, startDate, endDate);
 		}else{
 			return R.fail(402, "参数错误");
 		}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java

@@ -12,11 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -63,7 +59,6 @@ public class TProcessesAuxiliaryController {
         return itProcessesAuxiliaryService.updateByUid(tProcessesAuxiliaryQuery);
     }
 
-
     /**
      * 增加辅助工序
      *
@@ -75,5 +70,12 @@ public class TProcessesAuxiliaryController {
     public R insertTProcessesAuxiliary(@RequestBody TProcessesAuxiliaryQuery tProcessesAuxiliaryQuery) {
         return itProcessesAuxiliaryService.insertTProcessesAuxiliary(tProcessesAuxiliaryQuery);
     }
+
+    @ApiOperation(value = "查询最新的记录")
+    @GetMapping("/getLatest")
+    public cn.wise.im.common.http.R getLatest() {
+        return itProcessesAuxiliaryService.getLatest();
+    }
+
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java

@@ -84,5 +84,14 @@ public class TProcessesCrusherController {
         tProcessesCrusherQuery.setUid(uid);
         return itProcessesCrusherService.getByUid(tProcessesCrusherQuery);
     }
+
+
+    @ApiOperation(value = "查询最新的记录")
+    @GetMapping("/getLatest")
+    public cn.wise.im.common.http.R getLatest() {
+        return itProcessesCrusherService.getLatest();
+    }
+
+
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java

@@ -69,6 +69,13 @@ public class TProcessesDiggingController {
 	}
 
 
+	@ApiOperation(value = "查询最新的记录")
+	@GetMapping("/getLatest")
+	public R getLatest() {
+		return processesDiggingService.getLatest();
+	}
+
+
 
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java

@@ -70,6 +70,11 @@ public class TProcessesTruckController {
 		return processesTruckService.getDetail(Uid);
 	}
 
+	@ApiOperation(value = "查询最新的记录")
+	@GetMapping("/getLatest")
+	public R getLatest() {
+		return processesTruckService.getLatest();
+	}
 
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java

@@ -7,13 +7,17 @@ import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
 import cn.wise.sc.acquisition.business.model.query.TSafeTroubleQuery;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
 import cn.wise.sc.acquisition.business.service.ITSafeTroubleService;
+import cn.wise.sc.acquisition.business.util.ImageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -42,14 +46,14 @@ public class TSafeTroubleController {
 
 	@ApiOperation(value = "添加隐患")
 	@PostMapping("/save")
-	public R save(TSafeTroubleQuery query, HttpServletRequest request) {
-		return safeTroubleService.save(query, request);
+	public R save(@RequestBody TSafeTroubleQuery query) {
+		return safeTroubleService.save(query);
 	}
 
 	@ApiOperation(value = "隐患整改")
 	@PostMapping("/update")
-	public R update(TSafeTroubleQuery query, HttpServletRequest request) {
-		return safeTroubleService.update(query, request);
+	public R update(@RequestBody TSafeTroubleQuery query) {
+		return safeTroubleService.update(query);
 	}
 
 	@ApiOperation(value = "隐患详情")
@@ -60,6 +64,16 @@ public class TSafeTroubleController {
 
 
 
+	@ApiOperation(value = "上传图片-获取byte[]")
+	@PostMapping("/upload")
+	public R upload(MultipartFile file) {
+		boolean ref = ImageUtil.checkFileSize( file.getSize(),30,"M");
+		if(!ref){
+			return R.fail(400, "文件不能大于30M");
+		}
+		byte[] photoByte = ImageUtil.transformByte(file);
+		return R.ok(photoByte) ;
+	}
 
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/DataStatisticsMapper.xml

@@ -9,18 +9,6 @@
         <if test="params.TruckID != null and params.TruckID != ''">
             and tw.TruckID =  #{params.TruckID}
         </if>
-        <if test="params.cycle == 1 ">
-            and datediff(week, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle == 2 ">
-            and datediff(month, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 3 ">
-            and datediff(quarter, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 4 ">
-            and  datediff(year, tw.Rq,getdate())=0
-        </if>
         <if test="params.startDate != null and params.startDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
         </if>
@@ -42,18 +30,6 @@
         <if test="params.TruckID != null and params.TruckID != ''">
             and tw.TruckID =  #{params.TruckID}
         </if>
-        <if test="params.cycle == 1 ">
-            and datediff(week, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle == 2 ">
-            and datediff(month, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 3 ">
-            and datediff(quarter, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 4 ">
-            and  datediff(year, tw.Rq,getdate())=0
-        </if>
         <if test="params.startDate != null and params.startDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
         </if>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDiggingQuery.java

@@ -41,12 +41,6 @@ public class TProcessesDiggingQuery {
     @ApiModelProperty("爆区名称")
     private String blastAreaName;
 
-    /**
-     * 装车日期
-     */
-    @ApiModelProperty("装车日期")
-    private LocalDateTime digDate;
-
     /**
      * 项目经理
      */

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSafeTroubleQuery.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -80,8 +81,12 @@ public class TSafeTroubleQuery {
     private String fcr;
 
 
-/*    @ApiModelProperty("隐患照片")
-    private List<MultipartFile> photoList;*/
+    @ApiModelProperty("隐患图片数组集合")
+    private List<byte[]> bList;
+
+
+    @ApiModelProperty("整改图片数组集合")
+    private List<byte[]> zgbList;
 
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/IDataStatisticsService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface IDataStatisticsService {
 
-	R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate);
+	R<List<DataStatisticsVo>> countByPhoto(String TruckID, String startDate, String endDate);
 
-	R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate);
+	R<List<DataStatisticsTableVo>> countByTable(String TruckID, String startDate, String endDate);
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java

@@ -22,4 +22,5 @@ public interface ITProcessesAuxiliaryService extends IService<TProcessesAuxiliar
 
     R insertTProcessesAuxiliary(TProcessesAuxiliaryQuery query);
 
+    cn.wise.im.common.http.R<TProcessesAuxiliary> getLatest();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java

@@ -23,4 +23,6 @@ public interface ITProcessesCrusherService extends IService<TProcessesCrusher> {
     R updateByUid(TProcessesCrusherQuery query);
 
     R insertTProcessesCrusher(TProcessesCrusherQuery query);
+
+    cn.wise.im.common.http.R<TProcessesCrusher> getLatest();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java

@@ -27,6 +27,7 @@ public interface ITProcessesDiggingService extends IService<TProcessesDigging> {
 
 	R<TProcessesDigging> getDetail(String Uid);
 
+	R<TProcessesDigging> getLatest();
 
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java

@@ -27,4 +27,6 @@ public interface ITProcessesTruckService extends IService<TProcessesTruck> {
 
 	R<TProcessesTruck> getDetail(String Uid);
 
+	R<TProcessesTruck> getLatest();
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java

@@ -22,11 +22,11 @@ import java.util.List;
  */
 public interface ITSafeTroubleService extends IService<TSafeTrouble> {
 
-	R<IPage<TSafeTrouble>> getPage(PageQuery pageQuery);
+	R<IPage<TSafeTroubleVo>> getPage(PageQuery pageQuery);
 
-	R save(TSafeTroubleQuery query, HttpServletRequest request);
+	R save(TSafeTroubleQuery query);
 
-	R update(TSafeTroubleQuery query,HttpServletRequest request);
+	R update(TSafeTroubleQuery query);
 
 	R<TSafeTroubleVo> getDetail(String Uid);
 
@@ -37,4 +37,5 @@ public interface ITSafeTroubleService extends IService<TSafeTrouble> {
 
 
 
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/DataStatisticsServiceImpl.java

@@ -31,16 +31,14 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 	/**
 	 * 产品产量统计-图
 	 * @param TruckID
-	 * @param cycle
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
 	@Override
-    public R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate){
+    public R<List<DataStatisticsVo>> countByPhoto(String TruckID, String startDate, String endDate){
 		Map<String, Object> params = new HashMap<>();
 	    params.put("TruckID", TruckID);
-        params.put("cycle", cycle);
         params.put("startDate", startDate);
         params.put("endDate", endDate);
         List<DataStatisticsVo> list = dataStatisticsMapper.countByPhoto(params);
@@ -50,16 +48,14 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 	/**
 	 * 产品产量统计-表
 	 * @param TruckID
-	 * @param cycle
 	 * @param startDate
 	 * @param endDate
 	 * @return
 	 */
 	@Override
-	public R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate){
+	public R<List<DataStatisticsTableVo>> countByTable(String TruckID, String startDate, String endDate){
 		Map<String, Object> params = new HashMap<>();
 		params.put("TruckID", TruckID);
-		params.put("cycle", cycle);
 		params.put("startDate", startDate);
 		params.put("endDate", endDate);
 		List<DataStatisticsTableVo> list = dataStatisticsMapper.countByTable(params);

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java

@@ -2,6 +2,7 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
@@ -20,6 +21,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -34,6 +38,8 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
 
     @Autowired
     private ITSysDictService itSysDictService;
+    @Resource
+    private TProcessesAuxiliaryMapper processesAuxiliaryMapper;
 
     @Override
     public R getPage(TProcessesAuxiliaryQuery tProcessesAuxiliaryQuery, Query query) {
@@ -153,4 +159,29 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
             return R.failed("辅助工序中->增加失败");
         }
     }
+
+
+    /**
+     * 查询最新的记录
+     * @return
+     */
+    @Override
+    public cn.wise.im.common.http.R<TProcessesAuxiliary> getLatest(){
+        QueryWrapper<TProcessesAuxiliary> qw = new QueryWrapper<>();
+        qw.orderByDesc("DigDate");
+        List<TProcessesAuxiliary> list = processesAuxiliaryMapper.selectList(qw);
+        if(list != null && list.size()>0){
+            TProcessesAuxiliary processesAuxiliary = list.get(0);
+            return cn.wise.im.common.http.R.ok(processesAuxiliary);
+        }else{
+            return cn.wise.im.common.http.R.ok(null);
+        }
+    }
+
+
+
+
+
+
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java

@@ -2,6 +2,7 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesCrusherMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesCrusherQuery;
@@ -20,6 +21,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -34,6 +38,8 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
 
     @Autowired
     private ITSysDictService itSysDictService;
+    @Resource
+    private TProcessesCrusherMapper processesCrusherMapper;
 
     @Override
     public R getPage(TProcessesCrusherQuery tProcessesCrusherQuery, Query query) {
@@ -129,5 +135,22 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         }
     }
 
+    /**
+     * 查询最新的记录
+     * @return
+     */
+    @Override
+    public cn.wise.im.common.http.R<TProcessesCrusher> getLatest(){
+        QueryWrapper<TProcessesCrusher> qw = new QueryWrapper<>();
+        qw.orderByDesc("CrushDate");
+        List<TProcessesCrusher> list = processesCrusherMapper.selectList(qw);
+        if(list != null && list.size()>0){
+            TProcessesCrusher processesCrusher = list.get(0);
+            return cn.wise.im.common.http.R.ok(processesCrusher);
+        }else{
+            return cn.wise.im.common.http.R.ok(null);
+        }
+    }
+
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java

@@ -3,11 +3,9 @@ package cn.wise.sc.acquisition.business.service.impl;
 import cn.wise.im.common.http.R;
 import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
-import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesDiggingQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
@@ -15,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,6 +113,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
         }
         TProcessesDigging digging = new TProcessesDigging();
         BeanUtils.copyProperties(query, digging);
+        digging.setDigDate(LocalDateTime.now()); //装车日期  系统自动生成
         //设置tag
         com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
         if (r.getCode() != 0) {
@@ -160,5 +158,31 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
         return R.ok(digging);
     }
 
+    /**
+     * 查询最新的记录
+     * @return
+     */
+    @Override
+    public R<TProcessesDigging> getLatest(){
+        QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
+        qw.orderByDesc("DigDate");
+        List<TProcessesDigging> list = processesDiggingMapper.selectList(qw);
+        if(list != null && list.size()>0){
+            TProcessesDigging processesDigging = list.get(0);
+            return R.ok(processesDigging);
+        }else{
+            return R.ok(null);
+        }
+    }
+
+
+
+
+
+
+
+
+
+
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java

@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.service.impl;
 import cn.wise.im.common.http.R;
 import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
@@ -154,4 +155,23 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 	}
 
 
+	/**
+	 * 查询最新的记录
+	 * @return
+	 */
+	@Override
+	public R<TProcessesTruck> getLatest(){
+		QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
+		qw.orderByDesc("DeliveryDate");
+		List<TProcessesTruck> list = processesTruckMapper.selectList(qw);
+		if(list != null && list.size()>0){
+			TProcessesTruck processesTruck = list.get(0);
+			return R.ok(processesTruck);
+		}else{
+			return R.ok(null);
+		}
+	}
+
+
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java

@@ -59,12 +59,33 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 	 * @return
 	 */
 	@Override
-	public R<IPage<TSafeTrouble>> getPage(PageQuery pageQuery) {
+	public R<IPage<TSafeTroubleVo>> getPage(PageQuery pageQuery) {
 		QueryWrapper<TSafeTrouble> qw = new QueryWrapper<>();
 		qw.orderByDesc("Fxrq");
 		IPage<TSafeTrouble> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		page = safeTroubleMapper.selectPage(page, qw);
-		return R.ok(page);
+
+		QueryWrapper<TSafeTroubleImg> imgWrapper = new QueryWrapper<>();
+		List<TSafeTroubleImg> checkList = safeTroubleImgMapper.selectList(imgWrapper);
+
+		List<TSafeTroubleVo> voList = new ArrayList<>();
+		List<TSafeTrouble> list = page.getRecords();
+		for(TSafeTrouble safeTrouble : list){
+			TSafeTroubleVo safeTroubleVo = new TSafeTroubleVo();
+			BeanUtils.copyProperties(safeTrouble, safeTroubleVo);
+			//整改前照片
+			List<TSafeTroubleImg> oldImgs =  checkList.stream()
+					.filter(arg -> arg.getTroubleUid().equals(safeTrouble.getUid()) && arg.getImgType().equals(TSafeTroubleImg.ImgType.YH)).collect(Collectors.toList());
+			safeTroubleVo.setOldImgs(oldImgs);
+			//整改后照片
+			List<TSafeTroubleImg> newImgs =  checkList.stream()
+					.filter(arg -> arg.getTroubleUid().equals(safeTrouble.getUid()) && arg.getImgType().equals(TSafeTroubleImg.ImgType.ZG)).collect(Collectors.toList());
+			safeTroubleVo.setNewImgs(newImgs);
+			voList.add(safeTroubleVo);
+		}
+		IPage<TSafeTroubleVo> pagevo = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		pagevo.setRecords(voList);
+		return R.ok(pagevo);
 	}
 
 
@@ -74,76 +95,78 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 	 * @return
 	 */
 	@Override
-	public R save(TSafeTroubleQuery query, HttpServletRequest request) {
+	@Transactional
+	public R save(TSafeTroubleQuery query) {
 		Rcode.NOT_PARAM.assertNotNull(query);
 		TSafeTrouble safeTrouble = new TSafeTrouble();
 		BeanUtils.copyProperties(query, safeTrouble);
 		safeTroubleMapper.insert(safeTrouble);
 
-		Boolean ret = ServletFileUpload.isMultipartContent(request);
-		//保存隐患图片 变量名称只能用file  不能修改
-		if(ret){
-			List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
-			if (photos != null && photos.size() > 0) {
-				return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(),  photos);
+		if(query.getBList()!=null && query.getBList().size()>0){
+			for (byte[] bytes : query.getBList()) {
+				TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
+				safeTroubleImg.setTroubleUid(safeTrouble.getUid())
+						.setImg(bytes)
+						.setImgType(TSafeTroubleImg.ImgType.YH);
+				safeTroubleImgMapper.insert(safeTroubleImg);
 			}
 		}
-
 		return R.ok();
 	}
 
 
+
 	/**
 	 * 隐患整改
 	 * @param query
 	 * @return
 	 */
 	@Override
-	public R update(TSafeTroubleQuery query,HttpServletRequest request) {
+	public R update(TSafeTroubleQuery query) {
 		Rcode.NOT_PARAM.assertNotNull(query);
 		Rcode.NOT_PARAM.assertNotNull(query.getUid());
 		TSafeTrouble safeTrouble = safeTroubleMapper.selectById(query.getUid());
 		Rcode.NOT_FOUND.assertNotNull(safeTrouble);
 		BeanUtils.copyProperties(query, safeTrouble);
 		safeTroubleMapper.updateById(safeTrouble);
-
-		Boolean ret = ServletFileUpload.isMultipartContent(request);
-		//保存隐患图片 变量名称只能用file  不能修改
-		if(ret){
-			List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
-			if (photos != null && photos.size() > 0) {
-				return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(),  photos);
+		if(query.getBList()!=null && query.getBList().size()>0){
+			//删除之前的所有图片
+			QueryWrapper<TSafeTroubleImg> stiWrapper = new QueryWrapper<>();
+			stiWrapper.eq("TroubleUid", safeTrouble.getUid());
+			stiWrapper.eq("ImgType", TSafeTroubleImg.ImgType.YH);
+			safeTroubleImgMapper.delete(stiWrapper);
+
+			//保存没有删除的 和新添加的图片
+			for (byte[] bytes : query.getBList()) {
+				TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
+				safeTroubleImg.setTroubleUid(safeTrouble.getUid())
+						.setImg(bytes)
+						.setImgType(TSafeTroubleImg.ImgType.YH);
+				safeTroubleImgMapper.insert(safeTroubleImg);
 			}
 		}
 
-		return R.ok();
-	}
-
+		if(query.getZgbList()!=null && query.getZgbList().size()>0){
+			//删除之前的所有图片
+			QueryWrapper<TSafeTroubleImg> stiWrapper = new QueryWrapper<>();
+			stiWrapper.eq("TroubleUid", safeTrouble.getUid());
+			stiWrapper.eq("ImgType", TSafeTroubleImg.ImgType.ZG);
+			safeTroubleImgMapper.delete(stiWrapper);
 
-	/**
-	 * 保存隐患图片信息
-	 * @param imgType 隐患图片类型 ,分为隐患照片和整改后照片两类
-	 * @param Uid   隐患表id
-	 * @param photos  相片列表
-	 * @return
-	 */
-	private R saveImg(String imgType, String Uid, List<MultipartFile> photos){
-		if (photos != null && photos.size() > 0) {
-			for (MultipartFile file : photos) {
-				boolean ref = ImageUtil.checkFileSize( file.getSize(),30,"M");
-				if(!ref){
-					return R.fail(400, "文件不能大于30M");
-				}
+			//保存没有删除的 和新添加的图片
+			for (byte[] bytes : query.getZgbList()) {
 				TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
-				safeTroubleImg.setTroubleUid(Uid)
-						.setImg(ImageUtil.transformByte(file))
-						.setImgType(imgType);
+				safeTroubleImg.setTroubleUid(safeTrouble.getUid())
+						.setImg(bytes)
+						.setImgType(TSafeTroubleImg.ImgType.ZG);
 				safeTroubleImgMapper.insert(safeTroubleImg);
 			}
 		}
+
 		return R.ok();
 	}
 
+
 	/**
 	 * 隐患详情
 	 * @param Uid
@@ -169,13 +192,8 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 		List<TSafeTroubleImg> newImgs =  checkList.stream()
 				.filter(arg -> arg.getImgType().equals(TSafeTroubleImg.ImgType.ZG)).collect(Collectors.toList());
 		safeTroubleVo.setNewImgs(newImgs);
-
-
 		return R.ok(safeTroubleVo);
 	}
 
 
-
-
-
 }

acquisition-business/target/classes/application-dev.yml

@@ -7,14 +7,10 @@ spring:
   profiles:
     active: dev
   datasource:
-    # 192.168.110.85   fpsn       CementMine    fupingc@556
-#    url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
-#    username: sa
-#    password: admin!@#123
-    #正式环境部署
-    url: jdbc:sqlserver://192.168.10.16:1433;DatabaseName=CementMine
+    # 192.168.110.85   fpsn       CementMine
+    url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
     username: sa
-    password: fupingc@556
+    password: admin!@#123
     driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
     hikari:
       minimum-idle: 3