From 7a9deef40c60e1b0614acb7cd215a12829a8476d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Dec 2023 15:14:54 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/controller/DivisorController.java | 18 ++++-
screen-manage/src/main/java/com/moral/api/service/DivisorService.java | 13 ++++
screen-manage/src/main/java/com/moral/api/entity/Divisor.java | 12 ++-
screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java | 47 +++++++++++++--
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 31 ++++++++++
5 files changed, 105 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 2930b9a..44190f4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -750,4 +750,35 @@
}
+
+ /**
+ *
+ */
+ private double getDivisor(String code,double num){
+ double rs = 0.0;
+ if (code.contains("-")){
+ String data = code.substring(1);
+ rs = num - Double.parseDouble(data);
+ } else if (code.contains("*")){
+ String data = code.substring(1);
+ rs = num * Double.parseDouble(data);
+ } else if (code.contains("/")){
+ String data = code.substring(1);
+ rs = num / Double.parseDouble(data);
+ } else if (code.contains(",")){
+ String[] split = code.split(",");
+ for (String s : split) {
+ String[] split1 = s.split("<");
+ double sp1 = Double.parseDouble(split1[0]);
+ double sp2 = Double.parseDouble(split1[1]);
+ double sp3 = Double.parseDouble(split1[2]);
+ if (num>=sp1 && num<=sp2){
+ rs = num + sp3;
+ }
+ }
+ }else {
+ rs = num + Double.parseDouble(code);
+ }
+ return rs;
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java b/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
index 7b52cf6..89d5b9a 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
@@ -42,15 +42,14 @@
@Autowired
private DivisorService divisorService;
- @Autowired
- private DivisorMapper divisorMapper;
+
@PostMapping("insert")
@ApiOperation("������")
public ResultMessage insert(@Valid @RequestBody Divisor divisor){
QueryWrapper<Divisor> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", divisor.getMac()).eq("is_del", Constants.NOT_DELETE);
+ queryWrapper.eq("organization_id", divisor.getOrganizationId()).eq("is_del", Constants.NOT_DELETE);
if (divisorService.getOne(queryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
@@ -64,7 +63,7 @@
public ResultMessage update(@Valid @RequestBody Divisor divisor){
QueryWrapper<Divisor> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", divisor.getMac()).eq("is_del", Constants.NOT_DELETE);
+ queryWrapper.eq("organization_id", divisor.getOrganizationId()).eq("is_del", Constants.NOT_DELETE);
if (divisorService.getOne(queryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
@@ -75,11 +74,20 @@
@GetMapping("delete")
@ApiOperation("������")
public ResultMessage delete(@RequestParam @ApiParam(value = "id",name = "������id") Integer id){
- divisorMapper.deleteById(id);
+ divisorService.delete(id);
return ResultMessage.ok();
}
+
+ @GetMapping("select")
+ @ApiOperation("������")
+ public ResultMessage select(@RequestParam @ApiParam(value = "id",name = "������id") Integer id){
+ Divisor divisor = divisorService.queryById(id);
+ return ResultMessage.ok(ObjectUtils.isEmpty(divisor)?"0":divisor);
+ }
+
+
@GetMapping("page")
@ApiOperation("������")
public ResultMessage page(@RequestParam @ApiParam(value = "mac",name = "mac���") String mac,
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Divisor.java b/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
index a721a76..51afa1b 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
@@ -8,8 +8,6 @@
import java.util.Date;
-import javax.validation.constraints.NotNull;
-
import com.baomidou.mybatisplus.extension.activerecord.Model;
/**
@@ -22,15 +20,15 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-//@ApiModel(value="Divisor - Divisor������", description="Divisor - Divisor������")
+@ApiModel(value="Divisor - Divisor������", description="Divisor - Divisor������")
public class Divisor extends Model<Divisor> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "������")
private Integer id;
- @ApiModelProperty(value = "mac���")
- private String mac;
+ @ApiModelProperty(value = "������")
+ private String organizationId;
@ApiModelProperty(value = "pm2.5")
private String pm25;
@ApiModelProperty(value = "PM10")
@@ -53,4 +51,8 @@
private Date createTime;
@ApiModelProperty(value = "������������")
private Date updateTime;
+
+ private String createName;
+
+ private String updateName;
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DivisorService.java b/screen-manage/src/main/java/com/moral/api/service/DivisorService.java
index c95f9e3..21d4c12 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DivisorService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DivisorService.java
@@ -21,6 +21,19 @@
/**
+ * ������
+ * @param id
+ */
+ void delete(Integer id);
+
+ /**
+ * ������
+ * @param id
+ * @return
+ */
+ Divisor queryById(Integer id);
+
+ /**
* ������������
* @param mac
* @param page
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
index 696939b..ae7a16f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DivisorServiceImpl.java
@@ -15,11 +15,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.Divisor;
+import com.moral.api.entity.ManageAccount;
import com.moral.api.mapper.DivisorMapper;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.DivisorService;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
-
+import com.moral.util.TokenUtils;
/**
@@ -42,9 +44,14 @@
*/
@Override
public void insert(Divisor divisor) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
divisor.setIsDel(Constants.NOT_DELETE);
divisor.setCreateTime(new Date());
divisor.setUpdateTime(new Date());
+ divisor.setCreateName(manageAccount.getUserName());
divisorMapper.insert(divisor);
}
@@ -56,13 +63,17 @@
@Override
@Transactional
public void update(Divisor divisor) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
Divisor divisor1 = divisorMapper.selectById(divisor.getId());
divisor.setUpdateTime(new Date());
+ divisor.setUpdateName(manageAccount.getUserName());
divisorMapper.updateById(divisor);
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("���������"+divisor1.getMac()+"���������������������");
+ content.append("���������"+divisor1.getOrganizationId()+"���������������������");
content.append(ObjectUtils.isEmpty(divisor.getDustld())?",���������==>null":",���������==>"+divisor.getDustld());
content.append(ObjectUtils.isEmpty(divisor.getCo())?",co==>null":",co==>"+divisor.getCo());
content.append(ObjectUtils.isEmpty(divisor.getSo2())?",so2==>null":",so2==>"+divisor.getSo2());
@@ -73,6 +84,30 @@
content.append(ObjectUtils.isEmpty(divisor.getO3())?",o3==>null":",o3==>"+divisor.getO3());
LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+
+ /**
+ * ������
+ *
+ * @param id
+ */
+ @Override
+ public void delete(Integer id) {
+ Divisor divisor = divisorMapper.selectById(id);
+ divisor.setIsDel(Constants.DELETE);
+ divisorMapper.updateById(divisor);
+ }
+
+ /**
+ * ������
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public Divisor queryById(Integer id) {
+ Divisor divisor = divisorMapper.selectById(id);
+ return divisor;
}
/**
@@ -88,9 +123,9 @@
HashMap<String, Object> result = new HashMap<>();
LambdaQueryWrapper<Divisor> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Divisor::getIsDel,Constants.NOT_DELETE);
- if (!ObjectUtils.isEmpty(mac)){
- wrapper.like(Divisor::getMac,mac);
- }
+// if (!ObjectUtils.isEmpty(mac)){
+// wrapper.like(Divisor::getMac,mac);
+// }
Page<Divisor> PageList = new Page<>(Integer.parseInt(page), Integer.parseInt(size));
Page<Divisor> divisorPage = divisorMapper.selectPage(PageList, wrapper);
result.put("total", PageList.getTotal());
--
Gitblit v1.8.0