炮孔设计模块,设计爆区爆破量模块代码编写

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

@@ -5,6 +5,9 @@ import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuer
 import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.extension.api.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  前端控制器
@@ -23,19 +28,25 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/business/t-processes-blastdesign-hole")
+@Api(tags = "炮孔设计")
 public class TProcessesBlastdesignHoleController {
+
     @Autowired
     private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
     /**
      * 根据条件查询炮孔设计 分页
      *
-     * @param tProcessesBlastdesignHoleQuery
      * @return
      */
-    @ApiOperation(value = "获取送验单列表 可分页模糊查询")
+    @ApiOperation(value = "根据条件查询炮孔设计 可分页")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "designDate", value = "设计时间", paramType = "query", dataType = "LocalDateTime")
+    })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
-        return itProcessesBlastdesignHoleService.getPage(tProcessesBlastdesignHoleQuery,query);
+    public R getPage(LocalDateTime designDate,Query query) {
+        TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
+        param.setDesignDate(designDate);
+        return itProcessesBlastdesignHoleService.getPage(param,query);
     }
 
 
@@ -81,13 +92,17 @@ public class TProcessesBlastdesignHoleController {
     /**
      * 根据uid查询炮孔设计
      *
-     * @param tProcessesBlastdesignHoleQuery
      * @return
      */
     @ApiOperation(value = "根据uid查询炮孔设计")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "Uid", value = "uid", paramType = "query", dataType = "String")
+    })
     @RequestMapping(value = "/getByUid", method = RequestMethod.GET)
-    public R getByUid(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery) {
-        return itProcessesBlastdesignHoleService.getByUid(tProcessesBlastdesignHoleQuery);
+    public R getByUid(String Uid) {
+        TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
+        param.setUid(param.getUid());
+        return itProcessesBlastdesignHoleService.getByUid(param);
     }
 }
 

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

 package cn.wise.sc.acquisition.business.controller;
 
 
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.extension.api.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author renchao
@@ -23,20 +27,22 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/business/t-processes-blastdesign-volume")
+@Api(tags = "设计爆区爆破量（基本信息）")
 public class TProcessesBlastdesignVolumeController {
 
     @Autowired
     private ITProcessesBlastdesignVolumeService itProcessesBlastdesignVolumeService;
+
     /**
      * 查询设计爆区爆破量列表 分页
      *
-     * @param tProcessesBlastdesignVolumeQuery
      * @return
      */
     @ApiOperation(value = "查询设计爆区爆破量列表 分页")
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery, Query query) {
-        return itProcessesBlastdesignVolumeService.getPage(tProcessesBlastdesignVolumeQuery,query);
+    public R getPage(Query query) {
+        //tProcessesBlastdesignVolumeQuery 暂时传空，方便以后加需求
+        return itProcessesBlastdesignVolumeService.getPage(null, query);
     }
 
     /**
@@ -52,18 +58,25 @@ public class TProcessesBlastdesignVolumeController {
     }
 
 
-
-
     /**
      * 根据条件查询设计爆区爆破量
      *
-     * @param tProcessesBlastdesignVolumeQuery
      * @return
      */
     @ApiOperation(value = "根据条件查询设计爆区爆破量")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "blastAreaName", value = "爆区名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "stepName", value = "平台名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "stopeName", value = "采区名称", paramType = "query", dataType = "String")
+    })
     @RequestMapping(value = "/getByQuery", method = RequestMethod.GET)
-    public R getByQuery(TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery) {
-        return itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+    public R getByQuery(String blastAreaName, String stepName, String stopeName) {
+        //封装query对象
+        TProcessesBlastdesignVolumeQuery param = new TProcessesBlastdesignHoleQuery();
+        param.setBlastAreaName(blastAreaName);
+        param.setStepName(stepName);
+        param.setStopeName(stopeName);
+        return itProcessesBlastdesignVolumeService.getByQuery(param);
     }
 }
 

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

@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.service.ITSampleLaboratorysheetService;
 import com.baomidou.mybatisplus.extension.api.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,7 +37,6 @@ public class TSampleLaboratorysheetController {
     /**
      * 根据样号查看分析结果
      *
-     * @param tSampleLaboratorysheetQuery
      * @return
      */
     @ApiOperation(value = "根据样号查看分析结果")
@@ -44,8 +44,10 @@ public class TSampleLaboratorysheetController {
     @ApiImplicitParam(
             name = "Yh", value = "样号", required = true, dataType="String"
     )
-    public R getByYh(TSampleLaboratorysheetQuery tSampleLaboratorysheetQuery) {
-        return itSampleLaboratorysheetService.getByYh(tSampleLaboratorysheetQuery);
+    public R getByYh(String yh) {
+        TSampleLaboratorysheetQuery param = new TSampleLaboratorysheetQuery();
+        param.setYh(yh);
+        return itSampleLaboratorysheetService.getByYh(param);
     }
 
 
@@ -90,13 +92,17 @@ public class TSampleLaboratorysheetController {
     /**
      * 二维码下载
      *
-     * @param tSampleLaboratorysheetQuery
      * @return
      */
     @ApiOperation(value = "二维码下载")
-    @RequestMapping(value = "/getImage", method = RequestMethod.POST)
-    public R getImage(TSampleLaboratorysheetQuery tSampleLaboratorysheetQuery,final HttpServletResponse response) {
-        return itSampleLaboratorysheetService.getImage(tSampleLaboratorysheetQuery,response);
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "yh", value = "样号", paramType = "query", dataType = "String")
+    })
+    @RequestMapping(value = "/getImage", method = RequestMethod.GET)
+    public R getImage(String yh,final HttpServletResponse response) {
+        TSampleLaboratorysheetQuery param = new TSampleLaboratorysheetQuery();
+        param.setYh(yh);
+        return itSampleLaboratorysheetService.getImage(param,response);
     }
 }
 

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

@@ -6,6 +6,8 @@ import cn.wise.sc.acquisition.business.service.ITSampleListService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.extension.api.R;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,13 +35,17 @@ public class TSampleListController {
     /**
      * 根据条件查询送验单 分页
      *
-     * @param tSampleListQuery
      * @return
      */
     @ApiOperation(value = "获取送验单列表 可分页模糊查询")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "search", value = "搜索关键字", paramType = "query", dataType = "String")
+    })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(TSampleListQuery tSampleListQuery, Query query) {
-        return itSampleListService.getPage(tSampleListQuery,query);
+    public R getPage(Query query, String search) {
+        TSampleListQuery param = new TSampleListQuery();
+        param.setSearch(search);
+        return itSampleListService.getPage(param, query);
     }
 
 
@@ -63,7 +69,7 @@ public class TSampleListController {
      */
     @ApiOperation(value = "增加送验单")
     @RequestMapping(value = "/insertSampleList", method = RequestMethod.POST)
-    public R insertSampleList(@RequestBody TSampleListQuery tSampleListQuery ) {
+    public R insertSampleList(@RequestBody TSampleListQuery tSampleListQuery) {
         return itSampleListService.insertSampleList(tSampleListQuery);
     }
 
@@ -88,8 +94,8 @@ public class TSampleListController {
      */
     @ApiOperation(value = "保存图片")
     @RequestMapping(value = "/saveImage", method = RequestMethod.POST)
-    public R saveImage( TSampleListQuery query,@RequestParam(value = "file", required = true) MultipartFile file){
-        return itSampleListService.saveImage(query,file);
+    public R saveImage(TSampleListQuery query, @RequestParam(value = "file", required = true) MultipartFile file) {
+        return itSampleListService.saveImage(query, file);
     }
 
     /**
@@ -98,9 +104,14 @@ public class TSampleListController {
      * @return
      */
     @ApiOperation(value = "下载图片")
-    @RequestMapping(value="/getImage",method=RequestMethod.GET)
-    public R getImage(TSampleListQuery query,final HttpServletResponse response){
-        return itSampleListService.getImage(query,response);
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "yh", value = "样号", paramType = "query", dataType = "String")
+    })
+    @RequestMapping(value = "/getImage", method = RequestMethod.GET)
+    public R getImage(String yh, final HttpServletResponse response) {
+        TSampleListQuery param = new TSampleListQuery();
+        param.setYh(yh);
+        return itSampleListService.getImage(param, response);
     }
 
 }

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

@@ -191,7 +191,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
     }
 
     /**
-     * 获取图片二维码
+     * 获取图片记录形式
      *
      * @param query
      * @param response
@@ -203,13 +203,12 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //参加校验
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotEmpty(query.getYh());
-        Rcode.NOT_PARAM.assertNotNull(query.getImageType());
         TSampleList tSampleList = baseMapper.selectById(query.getYh());
         if (tSampleList == null) {
             return R.failed("数据不存在，样号：" + query.getYh());
         }
         //获取二维码或者记录形式
-        ImageUtil.getImage(query.getImageType(), tSampleList, response);
+        ImageUtil.getImage(ProjectEnum.ImageType.RECORD_CODE.getValue(), tSampleList, response);
         //如果下载失败才会执行return
         return R.failed("该条数据没有图片");
     }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/DateUtil.java

@@ -10,7 +10,6 @@ import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.WeekFields;
 import java.util.Date;
-import java.util.TimeZone;
 
 /**
  * @author neo.shu
@@ -169,9 +168,5 @@ public class DateUtil {
         return endT;
     }
 
-    public static void main(String[] args) {
-        System.out.println(getBeginTimeStr(LocalDateTime.now()));
-        System.out.println(getEndTimeStr(LocalDateTime.now()));
-    }
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/ImageUtil.java

@@ -18,7 +18,6 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Author renchao

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMaterialEntryMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSafeTroubleMapper">
+
+</mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TSysPowerMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TSysPowerMapper">
 
+    <select id="getPowerByRole" resultType="cn.wise.sc.acquisition.business.entity.TSysPower">
+        select p.*
+        from T_Sys_Power p
+        left join T_Sys_RolePower rp on rp.PowerID = p.ID
+        where rp.RoleID = #{params.roleId}
+    </select>
+
 </mapper>