Skip to content

A
amos-boot-biz
Commit 6edaf29f authored by suhuiguang's avatar suhuiguang
Browse files
Options

删除无用统计表使用一码通设备的idx_biz_jg_inspection_detection_info

parent 573df079
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 312 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionEquipStatistics.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 设备检验检测统计表
*
* @author system_generator
* @date 2023-12-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_jyjc_inspection_equip_statistics")
public class JyjcInspectionEquipStatistics extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 设备唯一标识
*/
@TableField("equip_unicode")
private String equipUnicode;
/**
* 检验日期
*/
@TableField("last_inspection_date")
private Date lastInspectionDate;
/**
* 下次检验日期
*/
@TableField("next_inspection_date")
private Date nextInspectionDate;
/**
* 最近检验检测结果主键
*/
@TableField("last_inspection_result_seq")
private Long lastInspectionResultSeq;
/**
* 备注(无用预留)
*/
@TableField("remark")
private String remark;
/**
* 设备状态（正常、临期、超期）
*/
@TableField("status")
private String status;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionEquipStatisticsMapper.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.api.mapper;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionEquipStatistics;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 设备检验检测统计表 Mapper 接口
*
* @author system_generator
* @date 2023-12-14
*/
public interface JyjcInspectionEquipStatisticsMapper extends BaseMapper<JyjcInspectionEquipStatistics> {
void deleteByApplicationSeq(Long seq);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionEquipStatisticsModel.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.api.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 设备检验检测统计表
*
* @author system_generator
* @date 2023-12-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JyjcInspectionEquipStatisticsModel", description="设备检验检测统计表")
public class JyjcInspectionEquipStatisticsModel extends BaseModel {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备唯一标识")
private String equipUnicode;
@ApiModelProperty(value = "检验日期")
private Date lastInspectionDate;
@ApiModelProperty(value = "下次检验日期")
private Date nextInspectionDate;
@ApiModelProperty(value = "最近检验检测结果主键")
private Long lastInspectionResultSeq;
@ApiModelProperty(value = "备注(无用预留)")
private String remark;
@ApiModelProperty(value = " 设备状态（正常、临期、超期）")
private String status;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionEquipStatisticsService.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.api.service;
/**
* 设备检验检测统计表接口类
*
* @author system_generator
* @date 2023-12-14
*/
public interface IJyjcInspectionEquipStatisticsService {}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionEquipStatisticsMapper.xml deleted 100644 → 0
View file @ 573df079
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionEquipStatisticsMapper">
<delete id="deleteByApplicationSeq">
delete
*
from
tz_jyjc_inspection_equip_statistics
where
application_seq = #{applicationSeq}
</delete>
</mapper>
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionEquipStatisticsController.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionEquipStatisticsServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionEquipStatisticsModel;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
*
*
* @author system_generator
* @date 2023-12-14
*/
@RestController
@Api(tags = "Api")
@RequestMapping(value = "/jyjc-inspection-equip-statistics")
public class JyjcInspectionEquipStatisticsController extends BaseController {
@Autowired
JyjcInspectionEquipStatisticsServiceImpl jyjcInspectionEquipStatisticsServiceImpl;
/**
* 新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<JyjcInspectionEquipStatisticsModel> save(@RequestBody JyjcInspectionEquipStatisticsModel model) {
model = jyjcInspectionEquipStatisticsServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JyjcInspectionEquipStatisticsModel> updateBySequenceNbrJyjcInspectionEquipStatistics(@RequestBody JyjcInspectionEquipStatisticsModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jyjcInspectionEquipStatisticsServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(jyjcInspectionEquipStatisticsServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JyjcInspectionEquipStatisticsModel> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionEquipStatisticsServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JyjcInspectionEquipStatisticsModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<JyjcInspectionEquipStatisticsModel> page = new Page<JyjcInspectionEquipStatisticsModel>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jyjcInspectionEquipStatisticsServiceImpl.queryForJyjcInspectionEquipStatisticsPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<JyjcInspectionEquipStatisticsModel>> selectForList() {
return ResponseHelper.buildResponse(jyjcInspectionEquipStatisticsServiceImpl.queryForJyjcInspectionEquipStatisticsList());
}
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 6edaf29f
......@@ -5,7 +5,6 @@ import cn.hutool.core.map.MapBuilder;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
......@@ -71,8 +70,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
JyjcInspectionApplicationEquipServiceImpl jyjcInspectionApplicationEquipService;
@Autowired
JyjcInspectionApplicationPushLogServiceImpl jyjcInspectionApplicationPushLogService;
@Autowired
JyjcInspectionEquipStatisticsServiceImpl jyjcInspectionEquipStatisticsService;
@Autowired
WorkflowFeignService workflowFeignService;
......@@ -97,7 +95,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setApplicationDate(new Date());
model = this.createWithModel(model);
//保存报检装备监管码
if (null != model.getEquip()&&model.getEquip().size() > 0) {
if (null != model.getEquip() && model.getEquip().size() > 0) {
List<Map<String, Object>> equip = model.getEquip();
List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
for (String s : jgm) {
......@@ -173,14 +171,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(seq);
jyjcInspectionApplicationAttachmentService.getBaseMapper().deleteByApplicationSeq(seq);
jyjcInspectionApplicationPushLogService.getBaseMapper().deleteByApplicationSeq(seq);
jyjcInspectionEquipStatisticsService.getBaseMapper().deleteByApplicationSeq(seq);
}
}
public Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,String equipClassify) {
return getBaseMapper().listByCategory(page,equipClassify);
public Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page, String equipClassify) {
return getBaseMapper().listByCategory(page, equipClassify);
}
......@@ -208,30 +205,28 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
return this.queryForList("", false);
}
public Map<String,Object> selectBySeq(Long sequenceNbr) {
public Map<String, Object> selectBySeq(Long sequenceNbr) {
JyjcInspectionApplicationModel model = this.getBaseMapper().selectDataBySeq(sequenceNbr);
JyjcInspectionApplicationModel model = this.getBaseMapper().selectDataBySeq(sequenceNbr);
Map<String, Object> map = BeanUtil.beanToMap(model);
List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
Map<String, Object> attMap = new HashMap<>();
for (Map<String, Object> maps : dataByApplicationSeq) {
List<AttachmentDto> data = JSONArray.parseArray(maps.get("attachment_url").toString(), AttachmentDto.class);
attMap.put(maps.get("attachment_type").toString(),data);
attMap.put(maps.get("attachment_type").toString(), data);
}
map.putAll(attMap);
return map;
return map;
}
/**
* 接收
*
*
* @param params params
* @return {@link }
* @author yangyang
* @throws
* @author yangyang
* @date 2023/12/15 15:14
*/
public void doReceive(Map<String, Object> params) {
......@@ -267,11 +262,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
/**
* 退回
*
*
* @param params params
* @return {@link }
* @author yangyang
* @throws
* @author yangyang
* @date 2023/12/15 15:14
*/
public void doReject(Map<String, Object> params) {
......@@ -287,7 +281,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
public void execueFlow(Map<String, Object> params) {
String op = params.get("op").toString();
String instanceId = params.get("instanceId").toString();
String comments= params.get("comments").toString();
String comments = params.get("comments").toString();
try {
AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
......@@ -296,8 +290,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus");
dto.setTaskId(taskId);
HashMap<String,Object> varibalble = new HashMap<>();
varibalble.put("approvalStatus",op);
HashMap<String, Object> varibalble = new HashMap<>();
varibalble.put("approvalStatus", op);
dto.setVariable(varibalble);
dto.setComment(comments);
// 执行流程
......@@ -317,7 +311,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
public void doRollback(String instanceId) {
try {
// 撤回流程
FeignClientResult feignClientResult =new FeignClientResult();
FeignClientResult feignClientResult = new FeignClientResult();
if (ObjectUtils.isEmpty(feignClientResult)) {
}
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionEquipStatisticsServiceImpl.java deleted 100644 → 0
View file @ 573df079
package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionEquipStatistics;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionEquipStatisticsMapper;
import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionEquipStatisticsService;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionEquipStatisticsModel;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 设备检验检测统计表服务实现类
*
* @author system_generator
* @date 2023-12-14
*/
@Service
public class JyjcInspectionEquipStatisticsServiceImpl extends BaseService<JyjcInspectionEquipStatisticsModel,JyjcInspectionEquipStatistics,JyjcInspectionEquipStatisticsMapper> implements IJyjcInspectionEquipStatisticsService {
/**
* 分页查询
*/
public Page<JyjcInspectionEquipStatisticsModel> queryForJyjcInspectionEquipStatisticsPage(Page<JyjcInspectionEquipStatisticsModel> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<JyjcInspectionEquipStatisticsModel> queryForJyjcInspectionEquipStatisticsList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment