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; } } 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, 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; } 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 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());
