adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
new file mode 100644
index 0000000..12f60ea
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_enviroment_record")
+public class BusinessEnvironmentRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "环境记录单编号", dataType = "String")
+ @TableField("environment_code")
+ private String environmentCode;
+
+ @ApiModelProperty(value = "房间编号", dataType = "String")
+ @TableField("room_number")
+ private String roomNumber;
+
+
+ @ApiModelProperty(value = "默认登录账号用户名", dataType = "String")
+ @TableField("recorder")
+ private String recorder;
+
+ @ApiModelProperty(value = "记录时间", dataType = "String")
+ @TableField("record_time")
+ private String recordTime;
+
+ @ApiModelProperty(value = "温度", dataType = "String")
+ @TableField("temperature")
+ private String temperature;
+
+ @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+ @TableField("humidity")
+ private String humidity;
+
+ @ApiModelProperty(value = "输出电压", dataType = "String")
+ @TableField("output_voltage")
+ private String outputVoltage;
+
+ @ApiModelProperty(value = "零地电压", dataType = "String")
+ @TableField("zero_ground_voltage")
+ private String zeroGroundVoltage;
+
+ @ApiModelProperty(value = "备注", dataType = "String")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("is_del")
+ private Boolean isDel;
+
+ @TableField("create_user")
+ private Long createUser;
+
+ @TableField("create_time")
+ private String createTime;
+
+ @TableField("update_time")
+ private String updateTime;
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
new file mode 100644
index 0000000..12f60ea
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_enviroment_record")
+public class BusinessEnvironmentRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "环境记录单编号", dataType = "String")
+ @TableField("environment_code")
+ private String environmentCode;
+
+ @ApiModelProperty(value = "房间编号", dataType = "String")
+ @TableField("room_number")
+ private String roomNumber;
+
+
+ @ApiModelProperty(value = "默认登录账号用户名", dataType = "String")
+ @TableField("recorder")
+ private String recorder;
+
+ @ApiModelProperty(value = "记录时间", dataType = "String")
+ @TableField("record_time")
+ private String recordTime;
+
+ @ApiModelProperty(value = "温度", dataType = "String")
+ @TableField("temperature")
+ private String temperature;
+
+ @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+ @TableField("humidity")
+ private String humidity;
+
+ @ApiModelProperty(value = "输出电压", dataType = "String")
+ @TableField("output_voltage")
+ private String outputVoltage;
+
+ @ApiModelProperty(value = "零地电压", dataType = "String")
+ @TableField("zero_ground_voltage")
+ private String zeroGroundVoltage;
+
+ @ApiModelProperty(value = "备注", dataType = "String")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("is_del")
+ private Boolean isDel;
+
+ @TableField("create_user")
+ private Long createUser;
+
+ @TableField("create_time")
+ private String createTime;
+
+ @TableField("update_time")
+ private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
deleted file mode 100644
index 5e48f7c..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.service.Impl.business;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-import com.casic.missiles.service.business.IBusinessEnviromentRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Service
-public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
new file mode 100644
index 0000000..12f60ea
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_enviroment_record")
+public class BusinessEnvironmentRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "环境记录单编号", dataType = "String")
+ @TableField("environment_code")
+ private String environmentCode;
+
+ @ApiModelProperty(value = "房间编号", dataType = "String")
+ @TableField("room_number")
+ private String roomNumber;
+
+
+ @ApiModelProperty(value = "默认登录账号用户名", dataType = "String")
+ @TableField("recorder")
+ private String recorder;
+
+ @ApiModelProperty(value = "记录时间", dataType = "String")
+ @TableField("record_time")
+ private String recordTime;
+
+ @ApiModelProperty(value = "温度", dataType = "String")
+ @TableField("temperature")
+ private String temperature;
+
+ @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+ @TableField("humidity")
+ private String humidity;
+
+ @ApiModelProperty(value = "输出电压", dataType = "String")
+ @TableField("output_voltage")
+ private String outputVoltage;
+
+ @ApiModelProperty(value = "零地电压", dataType = "String")
+ @TableField("zero_ground_voltage")
+ private String zeroGroundVoltage;
+
+ @ApiModelProperty(value = "备注", dataType = "String")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("is_del")
+ private Boolean isDel;
+
+ @TableField("create_user")
+ private Long createUser;
+
+ @TableField("create_time")
+ private String createTime;
+
+ @TableField("update_time")
+ private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
deleted file mode 100644
index 5e48f7c..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.service.Impl.business;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-import com.casic.missiles.service.business.IBusinessEnviromentRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Service
-public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService {
-
-}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
new file mode 100644
index 0000000..8d77f67
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -0,0 +1,84 @@
+package com.casic.missiles.service.Impl.business;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Service
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService {
+
+
+ @Override
+ public Page orderListPage(Page page, OrderListRequest request) throws Exception {
+ return null;
+ }
+
+ @Override
+ public BusinessEnvironmentRecord environmentDetail(Long id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ @Override
+ public ReturnDTO deleteEnvironment(Long id) {
+ if (this.baseMapper.deleteById(id) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO updateEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ if (this.baseMapper.updateById(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ initBusinessEnvironmentRecord(businessEnvironmentRecord);
+ if (baseMapper.insert(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+
+ }
+
+ private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ Long maxNo = this.baseMapper.selectMaxCode();
+ String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+ AuthUser authUser = ShiroKit.getUser();
+ businessEnvironmentRecord.setCreateUser(authUser.getId());
+ businessEnvironmentRecord.setEnvironmentCode(environmentNo);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
new file mode 100644
index 0000000..12f60ea
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_enviroment_record")
+public class BusinessEnvironmentRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "环境记录单编号", dataType = "String")
+ @TableField("environment_code")
+ private String environmentCode;
+
+ @ApiModelProperty(value = "房间编号", dataType = "String")
+ @TableField("room_number")
+ private String roomNumber;
+
+
+ @ApiModelProperty(value = "默认登录账号用户名", dataType = "String")
+ @TableField("recorder")
+ private String recorder;
+
+ @ApiModelProperty(value = "记录时间", dataType = "String")
+ @TableField("record_time")
+ private String recordTime;
+
+ @ApiModelProperty(value = "温度", dataType = "String")
+ @TableField("temperature")
+ private String temperature;
+
+ @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+ @TableField("humidity")
+ private String humidity;
+
+ @ApiModelProperty(value = "输出电压", dataType = "String")
+ @TableField("output_voltage")
+ private String outputVoltage;
+
+ @ApiModelProperty(value = "零地电压", dataType = "String")
+ @TableField("zero_ground_voltage")
+ private String zeroGroundVoltage;
+
+ @ApiModelProperty(value = "备注", dataType = "String")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("is_del")
+ private Boolean isDel;
+
+ @TableField("create_user")
+ private Long createUser;
+
+ @TableField("create_time")
+ private String createTime;
+
+ @TableField("update_time")
+ private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
deleted file mode 100644
index 5e48f7c..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.service.Impl.business;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-import com.casic.missiles.service.business.IBusinessEnviromentRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Service
-public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService {
-
-}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
new file mode 100644
index 0000000..8d77f67
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -0,0 +1,84 @@
+package com.casic.missiles.service.Impl.business;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Service
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService {
+
+
+ @Override
+ public Page orderListPage(Page page, OrderListRequest request) throws Exception {
+ return null;
+ }
+
+ @Override
+ public BusinessEnvironmentRecord environmentDetail(Long id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ @Override
+ public ReturnDTO deleteEnvironment(Long id) {
+ if (this.baseMapper.deleteById(id) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO updateEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ if (this.baseMapper.updateById(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ initBusinessEnvironmentRecord(businessEnvironmentRecord);
+ if (baseMapper.insert(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+
+ }
+
+ private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ Long maxNo = this.baseMapper.selectMaxCode();
+ String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+ AuthUser authUser = ShiroKit.getUser();
+ businessEnvironmentRecord.setCreateUser(authUser.getId());
+ businessEnvironmentRecord.setEnvironmentCode(environmentNo);
+ }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java
deleted file mode 100644
index 1d6496d..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.service.business;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface IBusinessEnviromentRecordService extends IService {
-
-}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 1991b83..53c9774 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,11 +1,31 @@
package com.casic.missiles.controller.business;
+import cn.hutool.core.lang.Assert;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Objects;
+
/**
*
- * 前端控制器
+ * 前端控制器
*
*
* @author wangpeng
@@ -13,6 +33,64 @@
*/
@RestController
@RequestMapping("/business/environmentRecord")
-public class BusinessEnvironmentRecordController {
+public class BusinessEnvironmentRecordController extends ExportController {
+
+ @Resource
+ private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
+// @ApiOperation("环境检测单查询")
+// @PostMapping("/listPage")
+// public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
+// if (bindingResult.hasErrors()) {
+// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+// }
+// Page page = PageFactory.defaultPage();
+// return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
+// }
+//
+ @ApiOperation("环境检测单详情")
+ @PostMapping("/detail")
+ public ReturnDTO adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.environmentDetail(idDTO.getId()));
+ }
+
+ @ApiOperation("环境检测单更新")
+ @PostMapping("/update")
+ public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult){
+ Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.updateEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单新增")
+ @PostMapping("/add")
+ public ReturnDTO addAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.addEnvironment(businessEnvironmentRecord));
+ }
+
+ @ApiOperation("环境检测单删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteAdvice(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
+ }
+//
+// //*******************************************************************************************************************//
+// @ApiOperation("环境检测单导出")
+// @PostMapping("/export")
+// public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
+// businessOrderService.orderExport(request, response);
+// }
}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
index 5d3bc2f..fa11713 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
@@ -1,7 +1,8 @@
package com.casic.missiles.mapper.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
/**
*
@@ -11,6 +12,7 @@
* @author wangpeng
* @since 2023-02-02
*/
-public interface BusinessEnviromentRecordMapper extends BaseMapper {
-
+public interface BusinessEnviromentRecordMapper extends BaseMapper {
+ @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from business_order")
+ Long selectMaxCode();
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index 4fb3b95..e80a3ad 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
deleted file mode 100644
index d2a85fe..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnviromentRecord.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.casic.missiles.model.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Data
-@TableName("business_enviroment_record")
-public class BusinessEnviromentRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private Long id;
-
- /**
- * 环境记录单编号
- */
- @TableField("environment_code")
- private String environmentCode;
-
- /**
- * 房间编号
- */
- @TableField("room_number")
- private String roomNumber;
-
- /**
- * 默认登录账号用户名
- */
- @TableField("recorder")
- private String recorder;
-
- /**
- * 记录时间
- */
- @TableField("record_time")
- private String recordTime;
-
- /**
- * 温度
- */
- @TableField("temperature")
- private String temperature;
-
- /**
- * 湿度
- */
- @TableField("humidity")
- private String humidity;
-
- /**
- * 输出电压
- */
- @TableField("output_voltage")
- private String outputVoltage;
-
- /**
- * 零地电压
- */
- @TableField("zero_ground_voltage")
- private String zeroGroundVoltage;
-
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
-
- @TableField("is_del")
- private Boolean isDel;
-
- @TableField("create_user")
- private Long createUser;
-
- @TableField("create_time")
- private String createTime;
-
- @TableField("update_time")
- private String updateTime;
-
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
new file mode 100644
index 0000000..12f60ea
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_enviroment_record")
+public class BusinessEnvironmentRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "环境记录单编号", dataType = "String")
+ @TableField("environment_code")
+ private String environmentCode;
+
+ @ApiModelProperty(value = "房间编号", dataType = "String")
+ @TableField("room_number")
+ private String roomNumber;
+
+
+ @ApiModelProperty(value = "默认登录账号用户名", dataType = "String")
+ @TableField("recorder")
+ private String recorder;
+
+ @ApiModelProperty(value = "记录时间", dataType = "String")
+ @TableField("record_time")
+ private String recordTime;
+
+ @ApiModelProperty(value = "温度", dataType = "String")
+ @TableField("temperature")
+ private String temperature;
+
+ @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+ @TableField("humidity")
+ private String humidity;
+
+ @ApiModelProperty(value = "输出电压", dataType = "String")
+ @TableField("output_voltage")
+ private String outputVoltage;
+
+ @ApiModelProperty(value = "零地电压", dataType = "String")
+ @TableField("zero_ground_voltage")
+ private String zeroGroundVoltage;
+
+ @ApiModelProperty(value = "备注", dataType = "String")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("is_del")
+ private Boolean isDel;
+
+ @TableField("create_user")
+ private Long createUser;
+
+ @TableField("create_time")
+ private String createTime;
+
+ @TableField("update_time")
+ private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
deleted file mode 100644
index 5e48f7c..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnviromentRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.casic.missiles.service.Impl.business;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-import com.casic.missiles.service.business.IBusinessEnviromentRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-@Service
-public class BusinessEnviromentRecordServiceImpl extends ServiceImpl implements IBusinessEnviromentRecordService {
-
-}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
new file mode 100644
index 0000000..8d77f67
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -0,0 +1,84 @@
+package com.casic.missiles.service.Impl.business;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import com.casic.missiles.model.business.BusinessOrder;
+import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerSampleInfo;
+import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Service
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl implements IBusinessEnvironmentRecordService {
+
+
+ @Override
+ public Page orderListPage(Page page, OrderListRequest request) throws Exception {
+ return null;
+ }
+
+ @Override
+ public BusinessEnvironmentRecord environmentDetail(Long id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ @Override
+ public ReturnDTO deleteEnvironment(Long id) {
+ if (this.baseMapper.deleteById(id) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO updateEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ if (this.baseMapper.updateById(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ initBusinessEnvironmentRecord(businessEnvironmentRecord);
+ if (baseMapper.insert(businessEnvironmentRecord) > 0)
+ return ReturnUtil.success();
+ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+ }
+
+ @Override
+ public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+
+ }
+
+ private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
+ Long maxNo = this.baseMapper.selectMaxCode();
+ String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+ AuthUser authUser = ShiroKit.getUser();
+ businessEnvironmentRecord.setCreateUser(authUser.getId());
+ businessEnvironmentRecord.setEnvironmentCode(environmentNo);
+ }
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java
deleted file mode 100644
index 1d6496d..0000000
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.casic.missiles.service.business;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.casic.missiles.model.business.BusinessEnviromentRecord;
-
-/**
- *
- * 服务类
- *
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface IBusinessEnviromentRecordService extends IService {
-
-}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
new file mode 100644
index 0000000..5bc1307
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
@@ -0,0 +1,33 @@
+package com.casic.missiles.service.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface IBusinessEnvironmentRecordService extends IService {
+ Page orderListPage(Page page, OrderListRequest request) throws Exception;
+
+ BusinessEnvironmentRecord environmentDetail(Long id);
+
+ ReturnDTO deleteEnvironment(Long id);
+
+ ReturnDTO updateEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord);
+
+ ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord);
+
+ void environmentExport(OrderListRequest request, HttpServletResponse response);
+
+}