Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
055fa066 由 康伟
选项

kangwei ：共享风险库与修复bug

1 个父辈 4a03ad02
全部展开
内嵌 并排
正在显示 34 个修改的文件 包含 390 行增加 和 176 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
......@@ -52,7 +52,7 @@ public class AjhMeetingSend {
@ApiModelProperty(value = "会议结束时间")
private String meetEndTime;
/**主持人*/
@Excel(name = "主持人", width = 15,orderNum = "8")
@Excel(name = "主持人", width = 15,orderNum = "8",dicCode = "id", dicText = "realname", dictTable = "sys_user")
@ApiModelProperty(value = "主持人")
@Dict(dicCode = "id", dicText = "realname", dictTable = "sys_user")
private String meetCompere;
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/DistributContractController.java
......@@ -95,16 +95,12 @@ public class DistributContractController {
public Result<DistributContractVO> add(@RequestBody DistributContractVO distributContract) {
Result<DistributContractVO> result = new Result<DistributContractVO>();
try {
String goodsCode = checkSameGoodCode(distributContract.getMaterialList());
if (StringUtils.isNotEmpty(goodsCode)) {
result.error500("操作失败,货号["+ goodsCode +"]重复!");
String errMsg = distributContractService.checkPurchaseContract(distributContract ,null,0);
if(errMsg != null){
result.error500(errMsg);
}else{
String errMsg = distributContractService.saveDistributContractVO(distributContract);
if(errMsg != null ){
result.error500(errMsg);
}else {
result.success("添加成功！");
}
distributContractService.saveDistributContractVO(distributContract);
result.success("添加成功！");
}
} catch (Exception e) {
log.error(e.getMessage(),e);
......@@ -122,17 +118,12 @@ public class DistributContractController {
if(distributContractEntity==null) {
result.error500("未找到对应实体");
}else {
String goodsCode = checkSameGoodCode(distributContract.getMaterialList());
if (StringUtils.isNotEmpty(goodsCode)) {
result.error500("操作失败,货号["+ goodsCode +"]重复!");
String errMsg = distributContractService.checkPurchaseContract(distributContract ,distributContract.getContractCode(),1);
if(errMsg != null ){
result.error500(errMsg);
}else{
String errMsg = distributContractService.updateDistributContractVO(distributContract);
if(errMsg != null ){
result.error500(errMsg);
}else{
result.success("修改成功！");
}
distributContractService.updateDistributContractVO(distributContract);
result.success("修改成功！");
}
}
return result;
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
......@@ -107,11 +107,9 @@ public class PurchaseContractController {
public Result<ERPPurchaseContract> add(@RequestBody PurchaseContractVO purchaseContractVO) {
Result<ERPPurchaseContract> result = new Result<ERPPurchaseContract>();
try {
String errorGoodsCode = purchaseContractService.checkGoodCode(purchaseContractVO ,0 );
if(errorGoodsCode != null ){
result.error500("校验失败，货号[ "+errorGoodsCode+" ]已经存在！");
}else if("404".equals(errorGoodsCode)){
result.error500("校验失败，货号必填！");
String errorMsg = purchaseContractService.checkPurchaseContract(purchaseContractVO , null,0);
if(StringUtils.isNotEmpty( errorMsg )){
result.error500( errorMsg );
}else{
purchaseContractService.savePurchaseContract(purchaseContractVO);
result.success("添加成功！");
......@@ -128,15 +126,13 @@ public class PurchaseContractController {
@PutMapping(value = "/edit")
public Result<ERPPurchaseContract> edit(@RequestBody PurchaseContractVO purchaseContractVO) {
Result<ERPPurchaseContract> result = new Result<ERPPurchaseContract>();
ERPPurchaseContract ERPPurchaseContractEntity = purchaseContractService.getById(purchaseContractVO.getId());
if(ERPPurchaseContractEntity ==null) {
ERPPurchaseContract purchaseContractEntity = purchaseContractService.getById(purchaseContractVO.getId());
if(purchaseContractEntity ==null) {
result.error500("未找到对应实体");
}else {
String errorGoodsCode = purchaseContractService.checkGoodCode(purchaseContractVO ,1 );
if(errorGoodsCode != null ){
result.error500("校验失败，货号[ "+errorGoodsCode+" ]已经存在！");
}else if("404".equals(errorGoodsCode)){
result.error500("校验失败，货号必填！");
String errorMsg = purchaseContractService.checkPurchaseContract(purchaseContractVO , purchaseContractEntity.getContractCode(),0);
if(StringUtils.isNotEmpty( errorMsg )){
result.error500( errorMsg );
}else{
purchaseContractService.updatePurchaseContract(purchaseContractVO);
result.success("修改成功！");
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/PurchasePlanItem.java
......@@ -91,7 +91,6 @@ public class PurchasePlanItem implements Serializable{
@ApiModelProperty(value = "总价")
private String totalPrice;
@TableField(exist=false)
@ApiModelProperty(value = "物料类别名称")
private String sparepartCode;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/DistributContractMapper.java
......@@ -10,5 +10,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* erp分销合同
*/
public interface DistributContractMapper extends BaseMapper<DistributContract> {
/***
* 校验合同编号唯一性
* @param contractCode
* @return
*/
int checkContractCode( @Param("contractCode") String contractCode);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/DistributMaterialMapper.java
......@@ -30,4 +30,6 @@ public interface DistributMaterialMapper extends BaseMapper<DistributMaterial> {
* @return
*/
int checkGoodCodeAndDepartId(@Param("goodCode") String goodsCode, @Param("departId") String departId);
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/PurchaseMaterialMapper.java
......@@ -65,4 +65,11 @@ public interface PurchaseMaterialMapper extends BaseMapper<PurchaseMaterial> {
* @return
*/
public IPage<PurchaseMaterialVO> queryPurchaseMaterialListByIn(Page<PurchaseMaterialVO> page,@Param("param") MaterialSearchVO materialSearchVO);
/***
* 根据id或code校验合同编号是否唯一
* @param contractCode
* @return
*/
public int checkContractCode(@Param("contractCode")String contractCode );
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/DistributContractMapper.xml
......@@ -2,4 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.erp.mapper.DistributContractMapper">
</mapper>
\ No newline at end of file
<!-- 校验合同编号唯一性-->
<select id="checkContractCode" resultType="java.lang.Integer">
select count(1) from erp_distribut_contract where contract_code = #{contractCode}
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/DistributMaterialMapper.xml
......@@ -27,4 +27,6 @@
select count(1) from erp_distribut_material
where good_code = #{goodCode} and depart_id = #{departId}
</select>
</mapper>
\ No newline at end of file
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/PurchaseMaterialMapper.xml
......@@ -76,5 +76,9 @@
left join ajh_supplier_manage sm on sm.id = aaa.supplier_id
</select>
<!-- 根据id或code校验合同编号是否唯一-->
<select id="checkContractCode" resultType="java.lang.Integer">
select count(1) from erp_purchase_contract where contract_code = #{contractCode}
</select>
</mapper>
\ No newline at end of file
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IDistributContractService.java
......@@ -6,6 +6,7 @@ import com.skua.modules.erp.entity.DistributMaterial;
import com.skua.modules.erp.entity.PurchaseMaterial;
import com.skua.modules.erp.entity.PurchasePlanItem;
import com.skua.modules.erp.vo.DistributContractVO;
import com.skua.modules.erp.vo.PurchaseContractVO;
import com.skua.modules.erp.vo.PurchasePlanVO;
import java.util.List;
......@@ -15,6 +16,13 @@ import java.util.List;
*/
public interface IDistributContractService extends IService<DistributContract> {
/***
* 校验数据
* @param distributContractVO
* @param checkCount
* @return
*/
String checkPurchaseContract(DistributContractVO distributContractVO, String oldContractCode, int checkCount );
/***
* 新增DistributContractVO
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IERPPurchaseContractService.java
......@@ -17,12 +17,21 @@ import java.util.List;
* 采购合同
*/
public interface IERPPurchaseContractService extends IService<ERPPurchaseContract> {
/***
* 校验数据
* @param purchaseContractVO
* @param checkCount
* @return
*/
String checkPurchaseContract(PurchaseContractVO purchaseContractVO,String oldContractCode, int checkCount );
/***
* 校验方法：校验是否唯一
* @param purchaseContractVO
* @param checkCount 新增= 0 ，修改checkCount=1
* @return 返回有问题的货号
*/
String checkGoodCode(PurchaseContractVO purchaseContractVO,int checkCount );
/***
* 新增purchaseContractVO
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/DistributContractServiceImpl.java
......@@ -33,39 +33,76 @@ public class DistributContractServiceImpl extends ServiceImpl<DistributContractM
@Resource
private ApproveRecordMapper recordMapper;//申请记录
@Autowired
@Resource
private SysDepartMapper departMapper;
/***
* 新增DistributContract
* 校验数据
* @param distributContractVO
* @param checkCount
* @return
*/
@Transactional
public String saveDistributContractVO(DistributContractVO distributContractVO){
public String checkPurchaseContract(DistributContractVO distributContractVO, String oldContractCode, int checkCount ){
String errMsg = null;
if(distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
String goodsCode = checkSameGoodCode(distributContractVO.getMaterialList());
if(goodsCode != null ){
errMsg ="操作失败,货号["+ goodsCode +"]重复!";
}
int count = 0;
if(!oldContractCode.equals(distributContractVO.getContractCode())){
count = this.baseMapper.checkContractCode(distributContractVO.getContractCode() );
if(count > checkCount ){
errMsg = "合同编号["+distributContractVO.getContractCode()+"]重复";
}
}
if( errMsg == null && distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
for(DistributMaterial material : distributContractVO.getMaterialList()){
//根据deptid与goodscode校验
int count = checkGoodCodeAndDepartId( material.getGoodCode(),distributContractVO.getDepartId() );
count = checkGoodCodeAndDepartId( material.getGoodCode(),distributContractVO.getDepartId() );
if(count > 0 ){
errMsg = "所属厂站["+departMapper.selectById(distributContractVO.getDepartId()).getDepartName()+"]下的货号["+material.getGoodCode()+"]已经分销过！";
break;
}
}
}
if(errMsg == null ){
int count = this.baseMapper.insert( distributContractVO );
if(count > 0 && distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
for(DistributMaterial material : distributContractVO.getMaterialList()){
material.setId(null);
material.setContractId( distributContractVO.getId() );
material.setDepartId(distributContractVO.getDepartId() ) ;//冗余所属厂站
materialMapper.insert( material );
}
return errMsg;
}
/***
* 校验是否有重复的货号
* @param materialList
* @return
*/
public String checkSameGoodCode(List<DistributMaterial> materialList){
String goodCode = "";
for( DistributMaterial material : materialList){
if(goodCode.contains( material.getGoodCode() )){
goodCode = material.getGoodCode();
break;
}
goodCode = goodCode + ","+material.getGoodCode();
}
return errMsg;
return null;
}
/***
* 新增DistributContract
* @param distributContractVO
*/
@Transactional
public String saveDistributContractVO(DistributContractVO distributContractVO){
int count = this.baseMapper.insert( distributContractVO );
if(count > 0 && distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
for(DistributMaterial material : distributContractVO.getMaterialList()){
material.setId(null);
material.setContractId( distributContractVO.getId() );
material.setDepartId(distributContractVO.getDepartId() ) ;//冗余所属厂站
materialMapper.insert( material );
}
}
return null;
}
......@@ -74,36 +111,21 @@ public class DistributContractServiceImpl extends ServiceImpl<DistributContractM
* @param distributContractVO
* @return
*/
@Transactional
public String updateDistributContractVO(DistributContractVO distributContractVO){
int count = this.baseMapper.updateById( distributContractVO );
// ge根据计划编号删除清单集合
materialMapper.delByContractId(distributContractVO.getId() ) ;
String errMsg = null;
if(distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
if(count > 0 && distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
for(DistributMaterial material : distributContractVO.getMaterialList()){
//根据deptid与goodscode校验
int count = checkGoodCodeAndDepartId( material.getGoodCode(),distributContractVO.getDepartId() );
if(count > 1 ){
errMsg = "所属厂站["+departMapper.selectById(distributContractVO.getDepartId()).getDepartName()+"]下的货号["+material.getGoodCode()+"]已经分销过！";
break;
}
}
}
if(errMsg != null ){
int count = this.baseMapper.updateById( distributContractVO );
// ge根据计划编号删除清单集合
materialMapper.delByContractId(distributContractVO.getId() ) ;
if(count > 0 && distributContractVO.getMaterialList() != null && !distributContractVO.getMaterialList().isEmpty()){
for(DistributMaterial material : distributContractVO.getMaterialList()){
material.setId(null);
material.setContractId( distributContractVO.getId() );
material.setDepartId(distributContractVO.getDepartId() ) ;//冗余所属厂站
materialMapper.insert( material );
}
material.setId(null);
material.setContractId( distributContractVO.getId() );
material.setDepartId(distributContractVO.getDepartId() ) ;//冗余所属厂站
materialMapper.insert( material );
}
}
return errMsg;
return null;
}
/***
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ERPPurchaseContractServiceImpl.java
......@@ -41,6 +41,39 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
/***
* 校验数据
* @param purchaseContractVO
* @param checkCount
* @return
*/
public String checkPurchaseContract(PurchaseContractVO purchaseContractVO,String oldContractCode ,int checkCount){
String result = null;
int count = 0;
if(!oldContractCode.equals(purchaseContractVO.getContractCode())){
count = purchaseMaterialMapper.checkContractCode(purchaseContractVO.getContractCode() );
if(count > checkCount ){
result = "合同编号["+purchaseContractVO.getContractCode()+"]重复";
}
}
if( result == null && purchaseContractVO.getMaterialList()!= null && !purchaseContractVO.getMaterialList().isEmpty()){
for(PurchaseMaterial purchaseMaterial : purchaseContractVO.getMaterialList()){
if(StringUtils.isNotEmpty(purchaseMaterial.getGoodCode())){
count = purchaseMaterialMapper.checkGoodCode(purchaseMaterial.getId(),purchaseMaterial.getGoodCode());
if(count > checkCount ){
result = "校验失败，货号[ "+purchaseMaterial.getGoodCode()+" ]已经存在！" ;
break;
}
}else{
result = "校验失败，货号必填！";
}
}
}
return result;
}
/***
* 校验方法：校验是否唯一
* @param purchaseContractVO
* @param checkCount 新增= 0 ，修改checkCount=1
......@@ -49,6 +82,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
public String checkGoodCode(PurchaseContractVO purchaseContractVO,int checkCount ){
String result = null;
int count = 0;
if( purchaseContractVO.getMaterialList()!= null && !purchaseContractVO.getMaterialList().isEmpty()){
for(PurchaseMaterial purchaseMaterial : purchaseContractVO.getMaterialList()){
if(StringUtils.isNotEmpty(purchaseMaterial.getGoodCode())){
......
sk-module-biz/src/main/java/com/skua/modules/process/controller/ProcessStatisticsController.java
......@@ -72,7 +72,6 @@ public class ProcessStatisticsController {
//巡检任务、维修任务、保养任务、危险作业、事故事件、安全隐患、、药剂入库
// 、、、、、药剂入库
String process_key = "AjhRectification";
processStatisticsList.add( queryProcessStatistics("安全隐患", process_key,page,bladeFlow) ) ;
process_key = "problemReport";
......
sk-module-biz/src/main/java/com/skua/modules/quartz/util/BaseUtil.java
......@@ -187,12 +187,8 @@ public class BaseUtil {
}
public static String getCurrentDate() {
Date dNow = new Date(); // 当前时间
Calendar calendar = Calendar.getInstance(); // 得到日历
calendar.setTime(dNow);// 把当前时间赋给日历
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 设置时间格式
String defaultStartDate = sdf.format(calendar); // 格式化时间
// String defaultEndDate = sdf.format(dNow); //格式化当前时间
String defaultStartDate = sdf.format(new Date()); // 格式化时间
return defaultStartDate;
}
public static String getLastYearDate() {
......@@ -210,6 +206,8 @@ public class BaseUtil {
return defaultStartDate;
}
/**
* 保留两位小数
*
......@@ -458,6 +456,8 @@ public class BaseUtil {
System.out.println(timeBeforeHour());
System.out.println(dateToTimeStamp(new Date(), "yyyy-MM-dd HH"));
System.out.println(BaseUtil.timeStampDate((1479312000-24*3600)+"","yyyy-MM-dd"));
System.out.println(BaseUtil.getLastYearDate());
String sql2 = "select count(1) from erp_material_in where confirm_status =2 and audit_status>0 and audit_status<3 and apply_time >= '"+BaseUtil.getLastYearDate()+"' and apply_time<='"+BaseUtil.getCurrentDate()+"' ";
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerLevelManageController.java
......@@ -16,11 +16,13 @@ import com.skua.core.query.QueryGenerator;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.zxing.QRCodeUtil;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import com.skua.modules.safe.service.IDangerLevelManageService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.safe.service.IDangerLevelManageShareService;
import com.skua.modules.system.mapper.SysConfigMapper;
import com.skua.modules.system.service.ISysConfigService;
import lombok.extern.slf4j.Slf4j;
......@@ -31,6 +33,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
......@@ -51,6 +54,8 @@ import io.swagger.annotations.ApiOperation;
public class DangerLevelManageController {
@Autowired
private IDangerLevelManageService dangerLevelManageService;
@Autowired
private IDangerLevelManageShareService dangerLevelManageShareService;
@Value("${skua.path.upload}")
private String upLoadPath;
@Value("${skua.web-url}")
......@@ -82,6 +87,23 @@ public class DangerLevelManageController {
}
@AutoLog(value = "风险分级管控清单-（共享）分页列表查询")
@ApiOperation(value="风险分级管控清单-（共享）分页列表查询", notes="风险分级管控清单-（共享）分页列表查询")
@GetMapping(value = "/shareList")
public Result<IPage<DangerLevelManageShare>> queryPageShareList(DangerLevelManageShare dangerLevelManage,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>();
QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
Page<DangerLevelManageShare> page = new Page<DangerLevelManageShare>(pageNo, pageSize);
IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "风险分级管控清单-列表查询")
@ApiOperation(value="风险分级管控清单-列表查询", notes="风险分级管控清单-分页列表查询")
@GetMapping(value = "/dangerList")
......@@ -94,7 +116,7 @@ public class DangerLevelManageController {
result.setResult(pageList);
return result;
}
/**
* 添加
* @param dangerLevelManage
......@@ -109,6 +131,14 @@ public class DangerLevelManageController {
dangerLevelManageService.save(dangerLevelManage);
dangerLevelManage.setQrCode( this.createQR( dangerLevelManage.getId())) ;
dangerLevelManageService.updateById( dangerLevelManage ) ;
//是否共享 添加到共享库
if("1".equals(dangerLevelManage.getIs_share())){
DangerLevelManageShare dangerLevelManageShare = new DangerLevelManageShare();
BeanUtils.copyProperties(dangerLevelManage , dangerLevelManageShare);
dangerLevelManageShareService.save( dangerLevelManageShare ) ;
}
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
......@@ -116,7 +146,7 @@ public class DangerLevelManageController {
}
return result;
}
/**
* 编辑
* @param dangerLevelManage
......@@ -134,12 +164,20 @@ public class DangerLevelManageController {
dangerLevelManage.setQrCode( this.createQR( dangerLevelManage.getId())) ;
dangerLevelManageService.updateById( dangerLevelManage ) ;
boolean ok = dangerLevelManageService.updateById(dangerLevelManage);
//是否共享 添加到共享库
if("1".equals(dangerLevelManage.getIs_share())){
dangerLevelManageShareService.removeById( dangerLevelManage.getId()) ;
DangerLevelManageShare dangerLevelManageShare = new DangerLevelManageShare();
BeanUtils.copyProperties(dangerLevelManage , dangerLevelManageShare);
dangerLevelManageShareService.save( dangerLevelManageShare ) ;
}
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
return result;
}
......@@ -162,7 +200,7 @@ public class DangerLevelManageController {
}
return qrCodePath;
}
/**
* 通过id删除
* @param id
......@@ -174,13 +212,15 @@ public class DangerLevelManageController {
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
try {
dangerLevelManageService.removeById(id);
//共享风险库
dangerLevelManageShareService.removeById( id) ;
} catch (Exception e) {
log.error("删除失败",e.getMessage());
return Result.error("删除失败!");
}
return Result.ok("删除成功!");
}
/**
* 批量删除
* @param ids
......@@ -195,11 +235,13 @@ public class DangerLevelManageController {
result.error500("参数不识别！");
}else {
this.dangerLevelManageService.removeByIds(Arrays.asList(ids.split(",")));
//删除共享风险库内容
this.dangerLevelManageShareService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
/**
* 通过id查询
* @param id
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/SafetyOffenceRecordController.java
......@@ -20,10 +20,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.safe.vo.SafetyOffenceRecordStatisticsVO;
import com.skua.modules.system.entity.SysUser;
import com.skua.modules.system.service.ISysConfigService;
import com.skua.modules.system.service.ISysUserDepartService;
import com.skua.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
......@@ -56,6 +59,8 @@ public class SafetyOffenceRecordController {
@Autowired
private ISysConfigService sysConfigService;
@Autowired
private ISysUserService userService;
@Autowired
private ISysUserDepartService sysUserDepartMapper;//用户部门关系表
......@@ -126,13 +131,17 @@ public class SafetyOffenceRecordController {
String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号
String userRoleIds = BaseContextHandler.getRoles();
//safetyOffenceRecord.setDepartId( "0" );//屏蔽数据使用；非安环管理员、与厂长角色看不到数据
//安装部长角色看集团类型的违法上报
if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
safetyOffenceRecord.setReportType("1");//上报集团--默认
}
if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长 ,查询分管的所有长编号
safetyOffenceRecord.setReportType("2");//上报厂长
if (!"1".equals(BaseContextHandler.get("userType"))) {
//safetyOffenceRecord.setDepartId( "0" );//屏蔽数据使用；非安环管理员、与厂长角色看不到数据
safetyOffenceRecord.setReportType("0");
//安装部长角色看集团类型的违法上报
if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
safetyOffenceRecord.setReportType("1");//上报集团--默认
}
if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长 ,查询分管的所有长编号
safetyOffenceRecord.setReportType("2");//上报厂长
}
}
//各个厂长角色看到厂长类型的违法上报 departId
QueryWrapper<SafetyOffenceRecord> queryWrapper = QueryGenerator.initQueryWrapper(safetyOffenceRecord, req.getParameterMap());
......@@ -156,22 +165,23 @@ public class SafetyOffenceRecordController {
Result<SafetyOffenceRecordStatisticsVO> result = new Result<SafetyOffenceRecordStatisticsVO>();
try {
SafetyOffenceRecordStatisticsVO safetyOffenceRecordStatisticsVO = null;
String reportType = null;
String departIds = null;
String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号
String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号
String userRoleIds = BaseContextHandler.getRoles();
//安装部长角色看集团类型的违法上报
if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
reportType ="1";
}
if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长
reportType = "2";
departIds = BaseContextHandler.getDeparts();
if (!"1".equals(BaseContextHandler.get("userType"))) {
String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号
String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号
String userRoleIds = BaseContextHandler.getRoles();
//安装部长角色看集团类型的违法上报
if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
reportType ="1";
}
if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长
reportType = "2";
departIds = BaseContextHandler.getDeparts();
}
}
safetyOffenceRecordStatisticsVO = safetyOffenceRecordService.statistics(reportType,departIds);
result.setResult( safetyOffenceRecordStatisticsVO );
result.success("操作成功！");
} catch (Exception e) {
......@@ -180,9 +190,6 @@ public class SafetyOffenceRecordController {
}
return result;
}
/**
* <pre>
* 添加
......@@ -199,6 +206,10 @@ public class SafetyOffenceRecordController {
Result<SafetyOffenceRecord> result = new Result<SafetyOffenceRecord>();
try {
safetyOffenceRecord.setCreateUserId(BaseContextHandler.getUserId());//创建人编号
if(StringUtils.isNotEmpty(safetyOffenceRecord.getReportUser() )){
SysUser sysUser = userService.getById(safetyOffenceRecord.getReportUser());
safetyOffenceRecord.setReportUserName( sysUser.getRealname() ) ;
}
safetyOffenceRecordService.save(safetyOffenceRecord);
result.success("添加成功！");
} catch (Exception e) {
......@@ -225,13 +236,16 @@ public class SafetyOffenceRecordController {
if(safetyOffenceRecordEntity==null) {
result.error500("未找到对应实体");
}else {
if(StringUtils.isNotEmpty(safetyOffenceRecord.getReportUser() )){
SysUser sysUser = userService.getById(safetyOffenceRecord.getReportUser());
safetyOffenceRecord.setReportUserName( sysUser.getRealname() ) ;
}
boolean ok = safetyOffenceRecordService.updateById(safetyOffenceRecord);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
return result;
}
......@@ -250,14 +264,12 @@ public class SafetyOffenceRecordController {
if(safetyOffenceRecord.getHandleTime() == null){
safetyOffenceRecord.setHandleTime(DateUtil.getInstance().getToday() );
}
boolean ok = safetyOffenceRecordService.updateById(safetyOffenceRecord);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
return result;
}
/**
......@@ -402,5 +414,4 @@ public class SafetyOffenceRecordController {
}
return Result.ok("文件导入失败！");
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManageShare.java 0 → 100644
package com.skua.modules.safe.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 风险分级管控清单（共享）
*/
@Data
@TableName("danger_level_manage_share")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="danger_level_manage共享风险库对象", description="共享风险分级管控清单")
public class DangerLevelManageShare extends DangerLevelManage{
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/SafetyOffenceRecord.java
......@@ -54,6 +54,9 @@ public class SafetyOffenceRecord {
@ApiModelProperty(value = "上报人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String reportUser;
@ApiModelProperty(value = "上报人名称")
private String reportUserName ="匿名" ;
/**上报时间*/
@Excel(name = "上报时间", width = 15)
@ApiModelProperty(value = "上报时间")
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerLevelManageShareMapper.java 0 → 100644
package com.skua.modules.safe.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import org.apache.ibatis.annotations.Param;
/**
* 风险分级管控清单
*/
public interface DangerLevelManageShareMapper extends BaseMapper<DangerLevelManageShare> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerLevelManageShareMapper.xml 0 → 100644
<?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.skua.modules.safe.mapper.DangerLevelManageShareMapper">
</mapper>
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/SafetyOffenceRecordMapper.xml
......@@ -14,9 +14,9 @@
<if test="departId != null ">
AND depart_id in ( ${departId})
</if>
<if test="handleStatus != null ">
<if test="status != null ">
AND status = #{status}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerLevelManageShareService.java 0 → 100644
package com.skua.modules.safe.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
/**
* 风险分级管控清单
*/
public interface IDangerLevelManageShareService extends IService<DangerLevelManageShare> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerLevelManageShareServiceImpl.java 0 → 100644
package com.skua.modules.safe.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import com.skua.modules.safe.mapper.DangerLevelManageShareMapper;
import com.skua.modules.safe.service.IDangerLevelManageShareService;
import org.springframework.stereotype.Service;
/**
* 风险分级管控清单
*/
@Service
public class DangerLevelManageShareServiceImpl extends ServiceImpl<DangerLevelManageShareMapper, DangerLevelManageShare> implements IDangerLevelManageShareService {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/SafetyOffenceRecordServiceImpl.java
......@@ -5,7 +5,6 @@ import com.skua.modules.safe.mapper.SafetyOffenceRecordMapper;
import com.skua.modules.safe.service.ISafetyOffenceRecordService;
import com.skua.modules.safe.vo.SafetyOffenceRecordStatisticsVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/DrugConsumptionAnalysisController.java
package com.skua.modules.equipment.controller;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.equipment.dto.DrugDto;
......@@ -12,10 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@Slf4j
@Api(tags = "药耗分析")
@RestController
......@@ -25,13 +22,12 @@ public class DrugConsumptionAnalysisController {
@Autowired
private IDrugConsumptionAnalysisService drugConsumptionAnalysisService;
@AutoLog(value = "数据展示")
@ApiOperation(value = "数据展示", notes = "数据展示")
@RequestMapping(value = "/data/display", method = RequestMethod.GET)
public Result<Map<String, Object>> dataDisplay(String time) {
public Result<Map<String, Object>> dataDisplay(String time,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.DataDisplay(time);
Map<String, Object> data = drugConsumptionAnalysisService.dataDisplay(time,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -41,9 +37,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "总药耗趋势")
@ApiOperation(value = "总药耗趋势", notes = "总药耗趋势")
@RequestMapping(value = "/drug/consumption/trend", method = RequestMethod.GET)
public Result<Map<String, Object>> drugConsumptionTrend(String time) {
public Result<Map<String, Object>> drugConsumptionTrend(String time,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.drugConsumptionTrend(time);
Map<String, Object> data = drugConsumptionAnalysisService.drugConsumptionTrend(time,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -52,9 +48,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "吨水药耗趋势")
@ApiOperation(value = "吨水药耗趋势", notes = "吨水药耗趋势")
@RequestMapping(value = "/consumption/ton/of/water/trend", method = RequestMethod.GET)
public Result<Map<String, Object>> consumptionTonOfWaterTrend(String time) {
public Result<Map<String, Object>> consumptionTonOfWaterTrend(String time ,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.consumptionTonOfWaterTrend(time);
Map<String, Object> data = drugConsumptionAnalysisService.consumptionTonOfWaterTrend(time ,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -63,9 +59,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "药剂占比统计 type 1.按明细 2.按类型")
@ApiOperation(value = "药剂占比统计 type 1.按明细 2.按类型", notes = "药剂占比统计 type 1.按明细 2.按类型")
@RequestMapping(value = "/proportion/statistics", method = RequestMethod.GET)
public Result<Map<String, Object>> proportionStatistics(String time,Integer type) {
public Result<Map<String, Object>> proportionStatistics(String time,Integer type,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.proportionStatistics(time,type);
Map<String, Object> data = drugConsumptionAnalysisService.proportionStatistics(time,type,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -74,9 +70,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "药剂占比统计列表 type 1.按明细 2.按类型")
@ApiOperation(value = "药剂占比统计列表 type 1.按明细 2.按类型", notes = "药剂占比统计列表 type 1.按明细 2.按类型")
@RequestMapping(value = "/proportion/statistics/detail", method = RequestMethod.GET)
public Result<Map<String, Object>> proportionStatisticsDetail(String time,Integer type) {
public Result<Map<String, Object>> proportionStatisticsDetail(String time,Integer type,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.proportionStatisticsDetail(time,type);
Map<String, Object> data = drugConsumptionAnalysisService.proportionStatisticsDetail(time,type,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -85,9 +81,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "相关性分析 type 1.絮凝剂 2.碳源 3.除磷剂")
@ApiOperation(value = "相关性分析 type 1.絮凝剂 2.碳源 3.除磷剂", notes = "相关性分析 type 1.絮凝剂 2.碳源 3.除磷剂")
@RequestMapping(value = "/correlation/analysis", method = RequestMethod.GET)
public Result<Map<String, Object>> correlationAnalysis(String time,Integer type) {
public Result<Map<String, Object>> correlationAnalysis(String time,Integer type,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.correlationAnalysis(time,type);
Map<String, Object> data = drugConsumptionAnalysisService.correlationAnalysis(time,type ,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......@@ -107,9 +103,9 @@ public class DrugConsumptionAnalysisController {
@AutoLog(value = "相关性分析药剂明细 type 1.絮凝剂 2.碳源 3.除磷剂")
@ApiOperation(value = "相关性分析药剂明细 type 1.絮凝剂 2.碳源 3.除磷剂", notes = "相关性分析药剂明细 type 1.絮凝剂 2.碳源 3.除磷剂")
@RequestMapping(value = "/correlation/analysis/detail", method = RequestMethod.GET)
public Result<Map<String, Object>> correlationAnalysisDetail(String time,Integer type) {
public Result<Map<String, Object>> correlationAnalysisDetail(String time,Integer type,String departId) {
Result<Map<String, Object>> result = new Result<>();
Map<String, Object> data = drugConsumptionAnalysisService.correlationAnalysisDetail(time,type);
Map<String, Object> data = drugConsumptionAnalysisService.correlationAnalysisDetail(time,type ,departId);
result.setResult(data);
result.setSuccess(true);
return result;
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/dto/DrugDto.java
......@@ -14,4 +14,7 @@ public class DrugDto {
@ApiModelProperty("结束时间")
private String endTime;
@ApiModelProperty("所属厂站")
private String departId;
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/ComprehensiveSupervisionMapper.java
......@@ -30,7 +30,7 @@ public interface ComprehensiveSupervisionMapper {
AlarmDto selectDhByYear(String year);
List<String> selectDataIdsByMonth(String month);
List<String> selectDataIdsByMonth( @Param("month") String month ,@Param("departId")String departId);
List<ReportItemCustomDto> selectItemCustom();
......@@ -41,8 +41,8 @@ public interface ComprehensiveSupervisionMapper {
String selectZyhByDataIds(@Param("list") List<String> dataIds);
List<AlarmDto> selectAllYh();
List<AlarmDto> selectYhByStartTimeAndEndTime(@Param("startTime") String startTime, @Param("endTime") String endTime);
//总药耗趋势
List<AlarmDto> selectYhByStartTimeAndEndTime(@Param("startTime") String startTime, @Param("endTime") String endTime , @Param("departId") String departId);
List<ReportItemCustomValueDto> selectItemDetail(@Param("list") List<String> dataIds);
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/ComprehensiveSupervisionMapper.xml
......@@ -66,6 +66,9 @@
</select>
<select id="selectDataIdsByMonth" resultType="java.lang.String">
SELECT DISTINCT data_id FROM `f_report_itemv` where SUBSTRING(data_time,1,7)=#{month}
<if test="departId != null">
and depart_id = #{departId}
</if>
</select>
<select id="selectItemCustom" resultType="com.skua.modules.equipment.dto.ReportItemCustomDto">
select id,pid,tree_path treePath,item_type itemType,item_name itemName,item_code itemCode
......@@ -85,7 +88,6 @@
<select id="selectVByDataIdAndPid" resultType="com.skua.modules.equipment.dto.ReportItemCustomDto">
SELECT b.item_type itemType,item_code itemCode,b.item_name itemName,sum(a.item_value) v FROM `f_report_item_yyrb_ext`a
LEFT JOIN f_report_item_custom b on a.item_name=b.id
<where>
<if test="list!=null and list.size>0">
and a.data_id in
......@@ -97,8 +99,6 @@
and b.tree_path LIKE CONCAT(CONCAT('%', #{id}),'%')
</if>
</where>
</select>
<select id="selectZyhByDataIds" resultType="java.lang.String">
select sum(a.item_value) from `f_report_item_yyrb_ext`a
......@@ -113,9 +113,15 @@
WHERE data_time is not null
GROUP BY SUBSTRING(data_time,1,7)
</select>
<!-- 总药耗趋势-->
<select id="selectYhByStartTimeAndEndTime" resultType="com.skua.modules.equipment.dto.AlarmDto">
SELECT sum(a.item_value) v,SUBSTRING(data_time,1,7) time from f_report_item_yyrb_ext a
LEFT JOIN (select DISTINCT data_id,data_time from f_report_itemv) b on a.data_id=b.data_id
LEFT JOIN (
select DISTINCT data_id,data_time from f_report_itemv
<where>
<if test="departId!=null">depart_id = #{departId}</if>
</where>
) b on a.data_id=b.data_id
WHERE data_time is not null
<if test="startTime!=null">
and SUBSTRING(data_time,1,7)>=#{startTime}
......@@ -429,4 +435,4 @@
and a.depart_id = #{factoryId}
group by DATE_FORMAT(data_time, '%Y-%m')
</select>
</mapper>
\ No newline at end of file
</mapper>
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IDrugConsumptionAnalysisService.java
......@@ -6,20 +6,20 @@ import com.skua.modules.equipment.dto.DrugDto;
import java.util.Map;
public interface IDrugConsumptionAnalysisService {
Map<String, Object> DataDisplay(String time);
Map<String, Object> drugConsumptionTrend(String time);
Map<String, Object> consumptionTonOfWaterTrend(String time);
Map<String, Object> proportionStatistics(String time, Integer type);
Map<String, Object> proportionStatisticsDetail(String time, Integer type);
Map<String, Object> correlationAnalysis(String time, Integer type);
//数据展示
Map<String, Object> dataDisplay(String time,String departId);
//总药耗趋势
Map<String, Object> drugConsumptionTrend(String time,String departId);
//吨水药耗趋势
Map<String, Object> consumptionTonOfWaterTrend(String time,String departId);
//药剂占比统计 type 1.按明细 2.按类型
Map<String, Object> proportionStatistics(String time, Integer type,String departId);
//药剂占比统计列表 type 1.按明细 2.按类型
Map<String, Object> proportionStatisticsDetail(String time, Integer type,String departId);
//相关性分析 type 1.絮凝剂 2.碳源 3.除磷剂
Map<String, Object> correlationAnalysis(String time, Integer type ,String departId);
//总药耗趋势详情
Map<String, Object> drugConsumptionTrendDetail(DrugDto drugDto);
Map<String, Object> correlationAnalysisDetail(String time, Integer type);
//相关性分析药剂明细 type 1.絮凝剂 2.碳源 3.除磷剂
Map<String, Object> correlationAnalysisDetail(String time, Integer type ,String departId);
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/PowerConsumptionAnalusisServiceImpl.java
......@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -23,13 +24,13 @@ import java.util.stream.Collectors;
@Service
public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAnalysisService {
@Autowired
@Resource
private ComprehensiveSupervisionMapper comprehensiveSupervisionMapper;
@Override
public Map<String, Object> dataDisplay(AnysisParamsVO anysisParamsVO) {
String time = anysisParamsVO.getTime();
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
Map<String, Object> result = Maps.newHashMap();
//目标吨水电耗
result.put("mbdsdh","0.5");
......@@ -158,7 +159,7 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
List<String> months=this.getTwelve(time);
List<powerConsumptionTrendDto> dtos=new ArrayList<>();//封装数据
Map<String, Object> result = Maps.newHashMap();
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
if(anysisParamsVO.getFactoryId()==null||"".equals(anysisParamsVO.getFactoryId())){
for (String month : months) {
powerConsumptionTrendDto dto=new powerConsumptionTrendDto();
......@@ -202,7 +203,7 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
//查询前推十二个月的数据
List<String> months=this.getTwelve(time);
Map<String, Object> result = Maps.newHashMap();
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
if(anysisParamsVO.getFactoryId()==null||"".equals(anysisParamsVO.getFactoryId())){
for (String month : months) {
TonOfWaterTrendDto dto=new TonOfWaterTrendDto();
......@@ -252,7 +253,7 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
List<String> months=this.getTwelve(time);
//查询吨水电耗
Map<String, Object> result = Maps.newHashMap();
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
if(anysisParamsVO.getFactoryId()==null||"".equals(anysisParamsVO.getFactoryId())){
for (String month : months) {
TonOfWaterAndLoadRateDto dto=new TonOfWaterAndLoadRateDto();
......@@ -310,7 +311,7 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
List<String> months = this.getTwelve(time);
Map<String, Object> result = Maps.newHashMap();
String[] strings={"JSCOD","CSCOD","CSNH3N","JSNH3N","JSTP","CSTP"};
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
if(anysisParamsVO.getFactoryId()==null||"".equals(anysisParamsVO.getFactoryId())){
List<PollutantConcentrationDto> dtodsdh = new ArrayList<>();
for (String month :months) {
......@@ -395,7 +396,7 @@ public class PowerConsumptionAnalusisServiceImpl implements IPowerConsumptionAna
//查询近12个月的数据
List<String> months=this.getTwelve(time);
Map<String, Object> result = Maps.newHashMap();
String factoryId = null;
String factoryId = anysisParamsVO.getFactoryId();
if(anysisParamsVO.getFactoryId()==null||"".equals(anysisParamsVO.getFactoryId())){
result.put("DSDH",this.tonOfWaterTrend(anysisParamsVO).get("data"));//吨水电耗
result.put("COD",this.getRemovalRate("","",null,null,months,factoryId));
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
......@@ -88,12 +88,12 @@ public class MybatisInterceptor implements Interceptor {
//用户试卷
add("edu_user_paper");
add("edu_paper");
//采购药剂物料
add("erp_purchase_plan_item");
add("erp_purchase_material");
add("erp_distribut_material");
//共享风险库
add("danger_level_manage_share");
}};
......@@ -102,9 +102,6 @@ public class MybatisInterceptor implements Interceptor {
add("com.skua.modules.remotecontrol.mapper.SysMonitorLocationMapper.getAllData");
}};
@Override
public Object intercept(Invocation invocation) throws Throwable {
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
......@@ -144,16 +141,13 @@ public class MybatisInterceptor implements Interceptor {
|| "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId)
|| "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectPageByOut".equals(sqlId)
|| "com.skua.modules.product.equipRemoteControl.mapper.RemoteControlMapper.queryEquipListDetail".equals(sqlId)
|| "com.skua.modules.erp.mapper.PurchasePlanMapper.statisticsPage".equals(sqlId) //采购计划统计
|| "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryMaterialByGoodCode".equals(sqlId) //采购合同根据code查询
|| "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划
|| "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
|| "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同
) {
log.debug("************************------sqlId------**************************" + sqlId);
return invocation.proceed();
}
Object[] args = invocation.getArgs();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!