工艺提交

liweidong
liweidong-hj 3 months ago
parent b693da98fd
commit 19896db778
  1. 10
      blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 5
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java
  3. 27
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java
  4. 1
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java
  5. 5
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
  6. 20
      blade-service/blade-desk/pom.xml
  7. 32
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
  8. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java
  9. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java
  10. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java
  11. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml
  12. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml
  13. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java
  14. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
  15. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
  16. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml
  17. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
  18. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
  19. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsSimilarPartsService.java
  20. 28
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java
  21. 31
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProModelServiceImpl.java
  22. 13
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java
  23. 17
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
  24. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java
  25. 170
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java
  26. 330
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java
  27. 230
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java
  28. 4
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java

@ -14,9 +14,9 @@ public interface LauncherConstant {
*/ */
// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
// 生产环境 // 生产环境
String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
// 测试环境 // 测试环境
// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
/** /**
* nacos 用户名 * nacos 用户名
@ -134,6 +134,12 @@ public interface LauncherConstant {
*/ */
String APPLICATION_MONITOR_NAME = "blade-monitor"; String APPLICATION_MONITOR_NAME = "blade-monitor";
/**
* 生产监控
*/
String APPLICATION_ERP_DATA_NAME = "blade-erpData";
/** /**
* seata 服务组格式 * seata 服务组格式
* *

@ -42,4 +42,9 @@ public class DsTaskingDTO extends DsTaskingEntity {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* taskId
*/
private String taskId;
} }

@ -59,6 +59,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
* 安排日期 * 安排日期
*/ */
@Schema(description = "安排日期") @Schema(description = "安排日期")
private Date arrangeTime; private Date arrangeTime;
/** /**
* 维护内容 * 维护内容
@ -104,7 +105,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
* 规则类型 * 规则类型
*/ */
@Schema(description = "规则类型") @Schema(description = "规则类型")
private Long ruleType; private Integer ruleType;
/** /**
* 参数1 * 参数1
*/ */
@ -140,16 +141,16 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
private Integer cumulativeTriggerValue; private Integer cumulativeTriggerValue;
/** /**
* 当前值累计 * 当前值
*/ */
@Schema(description = "当前值(累计)") @Schema(description = "当前值")
private Integer currentValue; private Integer currentValue;
/** /**
* 累计初始值 * 累计初始值
*/ */
@Schema(description = "累计初始值") @Schema(description = "累计初始值")
private Integer cumulativeInitialValue; private String cumulativeInitialValue;
/** /**
* 审核意见 * 审核意见
@ -157,4 +158,22 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
@Schema(description = "审核意见") @Schema(description = "审核意见")
private String approvalOpinion; private String approvalOpinion;
/**
* 累计类状态 1.进行中 2.已完成
*/
@Schema(description = "累计类状态")
private Integer accumulatedStatus;
/**
* 累计类有效期 1.长期 2.一次性
*/
@Schema(description = "累计类有效期")
private Integer periodOfValidity;
/**
* 设备外键
*/
@Schema(description = "设备(外键)")
private Long device;
} }

@ -246,7 +246,6 @@ public class DsPartEntity extends BaseEntity {
* 零件类型 * 零件类型
*/ */
@Schema(description = "零件类型") @Schema(description = "零件类型")
private Integer sinTerType; private Integer sinTerType;
/** /**

@ -172,6 +172,11 @@ public class DsTaskingEntity extends BaseEntity {
@Schema(description = "返工单号") @Schema(description = "返工单号")
private String reworkOrder; private String reworkOrder;
/**
* 接收时间
*/
@Schema(description = "接收时间")
private Date receptionTime;
} }

@ -72,21 +72,21 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!--老系统jar包--> <!--老系统jar包-->
<dependency> <!-- <dependency>-->
<groupId>com.videasoft</groupId> <!-- <groupId>com.videasoft</groupId>-->
<artifactId>vwebfrk-base</artifactId> <!-- <artifactId>vwebfrk-base</artifactId>-->
<version>1.4.6-RELEASE</version> <!-- <version>1.4.6-RELEASE</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
<version>3.0.9</version> <!-- 使用最新的稳定版本 --> <version>3.0.9</version> <!-- 使用最新的稳定版本 -->
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.videasoft.m3</groupId> <!-- <groupId>com.videasoft.m3</groupId>-->
<artifactId>barbecue</artifactId> <!-- <artifactId>barbecue</artifactId>-->
<version>0.0.1</version> <!-- <version>0.0.1</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.itextpdf</groupId> <groupId>com.itextpdf</groupId>
<artifactId>itext7-core</artifactId> <artifactId>itext7-core</artifactId>

@ -24,6 +24,38 @@ public interface BatchConstant {
Integer REGULAR_DEVICE = 4; Integer REGULAR_DEVICE = 4;
/** 槽液累计类规则类型*/
/**
* 电量差类
*/
public static final Integer ELECTRICITY_DIFFERENCE = 1;
/**
* 累计电量类
*/
public static final Integer CUMULATIVE_ELECTRICITY = 2;
/**
* 累计生产日期
*/
public static final Integer CUMULATIVE_PRODUCTION_DAYS = 3;
/**
* 主盐添加量类
*/
public static final Integer MAIN_SALT_ADDITION = 4;
/**
* 累计生产面积
*/
public static final Integer CUMULATIVE_PRODUCTION_AREA = 5;
/**
* 累计主盐添加量
*/
public static final Integer CUMULATIVE_MAIN_SALT_ADDITION = 6;
/** 槽液检查任务状态*/ /** 槽液检查任务状态*/
/** /**

@ -177,13 +177,12 @@ public class DsBatchPreservePlanController extends BladeController {
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
@Operation(summary = "审批", description = "") @Operation(summary = "审批", description = "")
public R factoryApproval() { public R factoryApproval() {
//todo 新增时没有向任务表中增加任务状态 是否更改 // 创建槽液精细化-计划类-任务发起任务定时器运行...
//todo 创建槽液精细化-计划类-任务发起任务定时器运行...
dsBatchPreservePlanService.createPlanClassTask(); dsBatchPreservePlanService.createPlanClassTask();
//todo 创建槽液精细化-定期类-任务发起任务定时器运行 // 查询3和4 没有时间限制 每天查询 每天新增
//todo 存在问题 查询3和4 没有时间限制 每天查询 每天新增 //创建槽液精细化-定期类-任务发起任务定时器运行...
dsBatchPreservePlanService.createPeriodicalClassTask(); dsBatchPreservePlanService.createPeriodicalClassTask();
//todo 创建槽液精细化-累计类-任务发起任务定时器运行 // 创建槽液精细化-累计类-任务发起任务定时器运行...
dsBatchPreservePlanService.createAccumulateClassTask(); dsBatchPreservePlanService.createAccumulateClassTask();
return R.status(true); return R.status(true);
} }

@ -116,7 +116,8 @@ public class DsSimilarPartsController extends BladeController {
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入dsSimilarParts") @Operation(summary = "新增", description = "传入dsSimilarParts")
public R save(@Valid @RequestBody DsSimilarPartsEntity dsSimilarParts) { public R save(@Valid @RequestBody DsSimilarPartsEntity dsSimilarParts) {
return R.status(dsSimilarPartsService.save(dsSimilarParts));
return R.status(dsSimilarPartsService.saveSimilarParts(dsSimilarParts));
} }
/** /**

@ -205,12 +205,12 @@ public class DsTaskingController extends BladeController {
/** /**
* 任务接收 * 任务接收
*/ */
@GetMapping("/taskReception") @PostMapping("/taskReception")
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
@Operation(summary = "任务接收") @Operation(summary = "任务接收")
public R taskReception( @RequestParam String taskIds) { public R taskReception( @RequestBody DsTaskingDTO tasking) {
Long Id = Long.valueOf(taskIds); Long taskId = Long.valueOf(tasking.getTaskId());
return R.status(dsTaskingService.taskReception(Id)); return R.status(dsTaskingService.taskReception(taskId));
} }

@ -30,6 +30,10 @@
<result column="CUMULATIVE_TRIGGER_VALUE" property="cumulativeTriggerValue"/> <result column="CUMULATIVE_TRIGGER_VALUE" property="cumulativeTriggerValue"/>
<result column="CURRENT_VALUE" property="currentValue"/> <result column="CURRENT_VALUE" property="currentValue"/>
<result column="CUMULATIVE_INITIAL_VALUE" property="cumulativeInitialValue"/> <result column="CUMULATIVE_INITIAL_VALUE" property="cumulativeInitialValue"/>
<result column="APPROVAL_OPINION" property="approvalOpinion"/>
<result column="ACCUMULATED_STATUS" property="accumulatedStatus"/>
<result column="PERIOD_OF_VALIDITY" property="periodOfValidity"/>
<result column="DEVICE" property="device"/>
</resultMap> </resultMap>

@ -26,6 +26,7 @@
<if test="dsBatchWorkCenterSet.wcId != null "> <if test="dsBatchWorkCenterSet.wcId != null ">
and WC_ID = #{dsBatchWorkCenterSet.wcId} and WC_ID = #{dsBatchWorkCenterSet.wcId}
</if> </if>
order by update_time desc
</select> </select>

@ -60,4 +60,5 @@ public interface DsSimilarPartsMapper extends BaseMapper<DsSimilarPartsEntity> {
*/ */
List<DsSimilarPartsExcel> exportDsSimilarParts(@Param("ew") Wrapper<DsSimilarPartsEntity> queryWrapper); List<DsSimilarPartsExcel> exportDsSimilarParts(@Param("ew") Wrapper<DsSimilarPartsEntity> queryWrapper);
DsSimilarPartsEntity selectByPartOneAndPartTwo(@Param("dsSimilarParts") DsSimilarPartsEntity dsSimilarParts);
} }

@ -75,7 +75,7 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
* @param dsTasking * @param dsTasking
* @return * @return
*/ */
List<DsTaskingVO> selectDisposeList(IPage<DsTaskingVO> page, @Param("dsTasking")DsTaskingVO dsTasking); List<DsTaskingVO> selectDisposeList(IPage<DsTaskingVO> page, @Param("dsTasking") DsTaskingVO dsTasking);
/** /**
* 根据零件号 版本号 任务状态查询 * 根据零件号 版本号 任务状态查询

@ -51,6 +51,7 @@
<result column="STATUS" property="status"/> <result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/> <result column="IS_DELETED" property="isDeleted"/>
<result column="SIN_TER_TYPE" property="sinTerType"/> <result column="SIN_TER_TYPE" property="sinTerType"/>
<result column="QUOTA" property="quota"/>
<result column="PLATE_TWO" property="plateTwo"/> <result column="PLATE_TWO" property="plateTwo"/>
<result column="PLATE_CODE_TWO" property="plateCodeTwo"/> <result column="PLATE_CODE_TWO" property="plateCodeTwo"/>
<result column="AREA_TWO" property="areaTwo"/> <result column="AREA_TWO" property="areaTwo"/>

@ -40,6 +40,7 @@
<if test="dsProModel.name != null and dsProModel.name != ''"> <if test="dsProModel.name != null and dsProModel.name != ''">
and name like concat(concat('%', #{dsProModel.name}), '%') and name like concat(concat('%', #{dsProModel.name}), '%')
</if> </if>
order by update_time desc
</select> </select>

@ -32,5 +32,10 @@
<select id="exportDsSimilarParts" resultType="org.springblade.desk.dashboard.excel.DsSimilarPartsExcel"> <select id="exportDsSimilarParts" resultType="org.springblade.desk.dashboard.excel.DsSimilarPartsExcel">
SELECT * FROM DS_SIMILAR_PARTS ${ew.customSqlSegment} SELECT * FROM DS_SIMILAR_PARTS ${ew.customSqlSegment}
</select> </select>
<select id="selectByPartOneAndPartTwo"
resultType="org.springblade.desk.dashboard.pojo.entity.DsSimilarPartsEntity">
select * from DS_SIMILAR_PARTS where is_deleted = 0
and PART_ONE = #{dsSimilarParts.partOne} and PART_TWO = #{dsSimilarParts.partTwo}
</select>
</mapper> </mapper>

@ -72,13 +72,16 @@
<if test="dsTasking.partCode != null "> <if test="dsTasking.partCode != null ">
and PART_CODE = #{dsTasking.partCode} and PART_CODE = #{dsTasking.partCode}
</if> </if>
<if test="dsTasking.craftMan != null and dsTasking.craftMan != ''">
and CRAFT_MAN = #{dsTasking.craftMan}
</if>
<if test="dsTasking.taskStatus == null and dsTasking.TaskStatusList != null"> <if test="dsTasking.taskStatus == null and dsTasking.TaskStatusList != null">
and TASK_STATUS in and TASK_STATUS in
<foreach collection="dsTasking.TaskStatusList" item="taskStatus" open="(" close=")" separator=","> <foreach collection="dsTasking.TaskStatusList" item="taskStatus" open="(" close=")" separator=",">
#{taskStatus} #{taskStatus}
</foreach> </foreach>
</if> </if>
ORDER BY CREATE_TIME DESC ORDER BY ASSIGN_TIME DESC
</select> </select>
<select id="selectDsTaskingByPartCodeAndVersion" <select id="selectDsTaskingByPartCodeAndVersion"

@ -64,4 +64,11 @@ public interface IDsSimilarPartsService extends BaseService<DsSimilarPartsEntity
* @return * @return
*/ */
boolean importExcelSimple(List<DsSimilarPartsVO> list); boolean importExcelSimple(List<DsSimilarPartsVO> list);
/**
* 新增
* @param dsSimilarParts
* @return
*/
boolean saveSimilarParts(DsSimilarPartsEntity dsSimilarParts);
} }

@ -191,13 +191,7 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
DsBatchPreserveTaskEntity dsBatchPreserveTask = null; DsBatchPreserveTaskEntity dsBatchPreserveTask = null;
if(!CollectionUtils.isEmpty(batchPreservePlanList)){ if(!CollectionUtils.isEmpty(batchPreservePlanList)){
for (DsBatchPreservePlanEntity batchPreservePlan : batchPreservePlanList) { for (DsBatchPreservePlanEntity batchPreservePlan : batchPreservePlanList) {
// 先判断是否有上次触发时间 在判断是否符合触发条件, this.createTask(batchPreservePlan, dsBatchPreserveTask);
if (batchPreservePlan.getLastTaskTime() != null) {
int days = (int) ((System.currentTimeMillis() - batchPreservePlan.getLastTaskTime().getTime()) / (1000 * 3600 * 24));
if (days >= batchPreservePlan.getFrequency()) {
this.createTask(batchPreservePlan, dsBatchPreserveTask);
}
}
} }
} }
} }
@ -209,6 +203,26 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
*/ */
private void createTask(DsBatchPreservePlanEntity batchPreservePlan, DsBatchPreserveTaskEntity dsBatchPreserveTask) { private void createTask(DsBatchPreservePlanEntity batchPreservePlan, DsBatchPreserveTaskEntity dsBatchPreserveTask) {
//电量差 (1)电量差:当前值为1天的电量(自动取数)≥累计触发值,触发任务需添加量
if(BatchConstant.ELECTRICITY_DIFFERENCE.equals(batchPreservePlan.getRuleType())){
//累计电量类 (2)累计电量:(当前日期的用电量-累计初始日期对应的用电量)≥累计触发值,触发任务需添加量
}else if(BatchConstant.CUMULATIVE_ELECTRICITY.equals(batchPreservePlan.getRuleType())){
//累计生产日期 (3)累计生产日期:当前日期-累计初始日期=累计触发值,触发任务需添加量
}else if(BatchConstant.CUMULATIVE_PRODUCTION_DAYS.equals(batchPreservePlan.getRuleType())){
//主盐添加量类 (4)累计生产面积:当前值为"累计初始值日期~当前日期"对应作业槽【浸保护剂】工序生产总面积≥累计触发值,触发任务需添加量
}else if(BatchConstant.MAIN_SALT_ADDITION.equals(batchPreservePlan.getRuleType())){
//累计生产面积 (5)主盐添加量:当前值为1天内【添加量填报】页面填报的作业槽添加量≥累计触发值,触发任务需添加量
}else if(BatchConstant.CUMULATIVE_PRODUCTION_AREA.equals(batchPreservePlan.getRuleType())){
//累计主盐添加量 (6)累计主盐添加量:当前值≥累计触发值(添加量),当前值为累计初始值日期开始在【添加量录入】页面填报的作业槽添加量总和
}else if(BatchConstant.CUMULATIVE_MAIN_SALT_ADDITION.equals(batchPreservePlan.getRuleType())){
}
} }

@ -101,16 +101,25 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
// 只复制相同字段名的属性 // 只复制相同字段名的属性
BeanUtils.copyProperties(dsProModelDetailListVO, entity); BeanUtils.copyProperties(dsProModelDetailListVO, entity);
entity.setProcessNum((long) dsProModelDetailListVO.getTableData().size());
//新增模版 //新增模版
save(entity); boolean save = save(entity);
if(!save){
throw new ServiceException("工艺模版新增失败");
}
Long modelId = entity.getId(); Long modelId = entity.getId();
List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData(); List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData();
for (DsProDetailEntity tableDatum : tableData) { for (DsProDetailEntity tableDatum : tableData) {
tableDatum.setModelId(modelId); tableDatum.setModelId(modelId);
} }
boolean saveBatch = proDetailService.saveBatch(tableData);
if(!saveBatch){
throw new ServiceException("工艺模版明细新增失败");
}
return proDetailService.saveBatch(tableData); return true;
} }
@Override @Override
@ -143,8 +152,13 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
DsProModelDetailListVO dsProModelDetailListVO = JSONObject.toJavaObject(data, DsProModelDetailListVO.class); DsProModelDetailListVO dsProModelDetailListVO = JSONObject.toJavaObject(data, DsProModelDetailListVO.class);
DsProModelEntity entity = new DsProModelEntity(); DsProModelEntity entity = new DsProModelEntity();
BeanUtils.copyProperties(dsProModelDetailListVO, entity); BeanUtils.copyProperties(dsProModelDetailListVO, entity);
entity.setProcessNum((long) dsProModelDetailListVO.getTableData().size());
//修改模版 //修改模版
updateById(entity); boolean update = updateById(entity);
if(!update){
throw new ServiceException("工艺模版修改失败");
}
Long modelId = entity.getId(); Long modelId = entity.getId();
List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData(); List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData();
@ -152,8 +166,15 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
tableDatum.setModelId(modelId); tableDatum.setModelId(modelId);
} }
//删除原模版数据 //删除原模版数据
proDetailService.deleteDetailByModelId(modelId); boolean delete = proDetailService.deleteDetailByModelId(modelId);
return proDetailService.saveBatch(tableData); if(!delete){
throw new ServiceException("工艺模版明细修改失败");
}
boolean saveBatch = proDetailService.saveBatch(tableData);
if(!saveBatch){
throw new ServiceException("工艺模版明细修改失败");
}
return true;
} }
@Override @Override

@ -109,7 +109,18 @@ public class DsSimilarPartsServiceImpl extends BaseServiceImpl<DsSimilarPartsMap
return true; return true;
} }
@Override
public boolean saveSimilarParts(DsSimilarPartsEntity dsSimilarParts) {
DsSimilarPartsEntity similarParts = similarPartsMapper.selectByPartOneAndPartTwo(dsSimilarParts);
if(null != similarParts ){
throw new ServiceException("零件号: "+similarParts.getPartOne()+"与 "+similarParts.getPartTwo()+"与存在");
}
int insert = similarPartsMapper.insert(dsSimilarParts);
if(insert <= 0){
throw new ServiceException("相似零件添加失败");
}
return true;
}
} }

@ -106,6 +106,8 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
@Autowired @Autowired
IBsProcessSetService processSetService; IBsProcessSetService processSetService;
@Override @Override
public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) { public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking); List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@ -350,15 +352,21 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
list.add(TaskingConstant.TASK_STATUS_UNDERWAY); list.add(TaskingConstant.TASK_STATUS_UNDERWAY);
dsTasking.setTaskStatusList(list); dsTasking.setTaskStatusList(list);
} }
String roleName = AuthUtil.getUser().getRoleName();
if("craftMan".equals(roleName)){
dsTasking.setCraftMan(AuthUtil.getUser().getNickName());
};
List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking); List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
if(!CollectionUtils.isEmpty(dsTaskingList)){ if(!CollectionUtils.isEmpty(dsTaskingList)){
for (DsTaskingVO dsTaskingVO : dsTaskingList) { for (DsTaskingVO dsTaskingVO : dsTaskingList) {
String partCode = dsTaskingVO.getPartCode(); String partCode = dsTaskingVO.getPartCode();
DsPartEntity partEntity = partService.selectDsPartByPatCode(partCode); DsPartEntity partEntity = partService.selectDsPartByPatCode(partCode);
String isSintering = partEntity.getIsSintering(); //查询子件信息
if(TaskingConstant.IS_SINTERING.equals(isSintering)){ List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
List<DsPartEntity> dsPartEntityList = partService.selectDsPartByParentID(partEntity.getId()); //获取所有子件ID
List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(idList)){
List<DsPartEntity> dsPartEntityList = partService.selectDsPartByIds(idList);
dsTaskingVO.setChildren(dsPartEntityList); dsTaskingVO.setChildren(dsPartEntityList);
} }
} }
@ -418,6 +426,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
DsTaskingEntity dsTaskingEntity = taskingMapper.selectById(taskId); DsTaskingEntity dsTaskingEntity = taskingMapper.selectById(taskId);
if(TaskingConstant.TASK_STATUS_ALREADY.equals(dsTaskingEntity.getTaskStatus())){ if(TaskingConstant.TASK_STATUS_ALREADY.equals(dsTaskingEntity.getTaskStatus())){
dsTaskingEntity.setTaskStatus(TaskingConstant.TASK_STATUS_UNDERWAY); dsTaskingEntity.setTaskStatus(TaskingConstant.TASK_STATUS_UNDERWAY);
dsTaskingEntity.setReceptionTime(new Date());
taskingMapper.updateById(dsTaskingEntity); taskingMapper.updateById(dsTaskingEntity);
return true; return true;
} }

@ -48,7 +48,6 @@ import org.springblade.desk.energy.excel.BsSafeInspectionPointExcel;
import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity;
import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO;
import org.springblade.desk.energy.service.IBsSafeInspectionPointService; import org.springblade.desk.energy.service.IBsSafeInspectionPointService;
import org.springblade.desk.energy.util.ExportUtil;
import org.springblade.desk.energy.wrapper.BsSafeInspectionPointWrapper; import org.springblade.desk.energy.wrapper.BsSafeInspectionPointWrapper;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -76,7 +75,7 @@ public class BsSafeInspectionPointController {
private final IBsSafeInspectionPointService bsSafeInspectionPointService; private final IBsSafeInspectionPointService bsSafeInspectionPointService;
private final ExportUtil exportUtil; // private final ExportUtil exportUtil;
/** /**
* 巡检点配置表 详情 * 巡检点配置表 详情
@ -222,7 +221,7 @@ public class BsSafeInspectionPointController {
reportId = "safety_inspectionPoint"; reportId = "safety_inspectionPoint";
} }
//ipIdList.forEach(id -> list.add(safeInspectionPointService.getByKey(id))); //ipIdList.forEach(id -> list.add(safeInspectionPointService.getByKey(id)));
exportUtil.export(reportId, exportType, "安全巡检点", list, null,request, response); // exportUtil.export(reportId, exportType, "安全巡检点", list, null,request, response);
} }
/** /**
* 巡检点配置表 导出pdf * 巡检点配置表 导出pdf

@ -1,85 +1,85 @@
package org.springblade.desk.energy.util; //package org.springblade.desk.energy.util;
//
import com.alibaba.fastjson.JSONObject; //import com.alibaba.fastjson.JSONObject;
import com.videasoft.configs.EnumConfiger; //import com.videasoft.configs.EnumConfiger;
import com.videasoft.configs.XmlConfigReader; //import com.videasoft.configs.XmlConfigReader;
import jakarta.annotation.PostConstruct; //import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import java.text.MessageFormat; //import java.text.MessageFormat;
import java.util.LinkedHashMap; //import java.util.LinkedHashMap;
import java.util.Map; //import java.util.Map;
@Component //@Component
public class Configer { //public class Configer {
private static final Map<String, String> configerMap = new LinkedHashMap(); // private static final Map<String, String> configerMap = new LinkedHashMap();
private static final Map<String, EnumConfiger> enumConfigerMap = new LinkedHashMap(); // private static final Map<String, EnumConfiger> enumConfigerMap = new LinkedHashMap();
//
public Configer() { // public Configer() {
} // }
//
public static String getValue(String code) { // public static String getValue(String code) {
return (String)configerMap.get(code); // return (String)configerMap.get(code);
} // }
//
public static String getValue(String code, String defaultValue) { // public static String getValue(String code, String defaultValue) {
String v = getValue(code); // String v = getValue(code);
return v == null ? defaultValue : v; // return v == null ? defaultValue : v;
} // }
//
public static String getValue(String id, String[] args) { // public static String getValue(String id, String[] args) {
String value = getValue(id); // String value = getValue(id);
if (value != null) { // if (value != null) {
value = MessageFormat.format(value, (Object[])args); // value = MessageFormat.format(value, (Object[])args);
} // }
//
return value; // return value;
} // }
//
public static EnumConfiger getEnumConfiger(String id) { // public static EnumConfiger getEnumConfiger(String id) {
return (EnumConfiger)enumConfigerMap.get(id); // return (EnumConfiger)enumConfigerMap.get(id);
} // }
//
public static String getEnumValue(String id, String code) { // public static String getEnumValue(String id, String code) {
String enumValue = null; // String enumValue = null;
EnumConfiger enumConfiger = getEnumConfiger(id); // EnumConfiger enumConfiger = getEnumConfiger(id);
if (enumConfiger != null) { // if (enumConfiger != null) {
enumValue = enumConfiger.getEnumValue(code); // enumValue = enumConfiger.getEnumValue(code);
} // }
//
return enumValue; // return enumValue;
} // }
//
public static String getEnumValue(String id, String code, String[] args) { // public static String getEnumValue(String id, String code, String[] args) {
String enumValue = getEnumValue(id, code); // String enumValue = getEnumValue(id, code);
if (enumValue != null) { // if (enumValue != null) {
enumValue = MessageFormat.format(enumValue, (Object[])args); // enumValue = MessageFormat.format(enumValue, (Object[])args);
} // }
//
return enumValue; // return enumValue;
} // }
//
public static JSONObject getJsonEnum(String id) { // public static JSONObject getJsonEnum(String id) {
JSONObject json = new JSONObject(); // JSONObject json = new JSONObject();
EnumConfiger enumConfiger = getEnumConfiger(id); // EnumConfiger enumConfiger = getEnumConfiger(id);
if (enumConfiger != null) { // if (enumConfiger != null) {
json.putAll(enumConfiger.getOption()); // json.putAll(enumConfiger.getOption());
} // }
//
return json; // return json;
} // }
@PostConstruct // @PostConstruct
public static void init() { // public static void init() {
XmlConfigReader loader = new XmlConfigReader(); // XmlConfigReader loader = new XmlConfigReader();
configerMap.clear(); // configerMap.clear();
configerMap.putAll(loader.loadKeyValues()); // configerMap.putAll(loader.loadKeyValues());
enumConfigerMap.clear(); // enumConfigerMap.clear();
enumConfigerMap.putAll(loader.loadEnumConfigs()); // enumConfigerMap.putAll(loader.loadEnumConfigs());
} // }
//
public static void appendLoad(XmlConfigReader reader) { // public static void appendLoad(XmlConfigReader reader) {
if (reader != null) { // if (reader != null) {
configerMap.putAll(reader.loadKeyValues()); // configerMap.putAll(reader.loadKeyValues());
enumConfigerMap.putAll(reader.loadEnumConfigs()); // enumConfigerMap.putAll(reader.loadEnumConfigs());
} // }
} // }
} //}

@ -1,165 +1,165 @@
package org.springblade.desk.energy.util; //package org.springblade.desk.energy.util;
//
import com.videasoft.utils.other.Function; //import com.videasoft.utils.other.Function;
import com.videasoft.webframework.common.web.report.HtmlExporterUtil; //import com.videasoft.webframework.common.web.report.HtmlExporterUtil;
import com.videasoft.webframework.common.web.report.ReportModel; //import com.videasoft.webframework.common.web.report.ReportModel;
import com.videasoft.webframework.configs.ReportInfoReader; //import com.videasoft.webframework.configs.ReportInfoReader;
import jakarta.servlet.ServletOutputStream; //import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletRequest; //import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; //import jakarta.servlet.http.HttpServletResponse;
import net.sf.jasperreports.engine.JRException; //import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperExportManager; //import net.sf.jasperreports.engine.JasperExportManager;
import net.sf.jasperreports.engine.JasperPrint; //import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter; //import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
import net.sf.jasperreports.export.ExporterInput; //import net.sf.jasperreports.export.ExporterInput;
import net.sf.jasperreports.export.OutputStreamExporterOutput; //import net.sf.jasperreports.export.OutputStreamExporterOutput;
import net.sf.jasperreports.export.SimpleExporterInput; //import net.sf.jasperreports.export.SimpleExporterInput;
import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; //import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
import org.apache.commons.lang3.StringUtils; //import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import java.io.IOException; //import java.io.IOException;
import java.io.OutputStream; //import java.io.OutputStream;
import java.io.PrintWriter; //import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; //import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; //import java.net.URLEncoder;
import java.util.HashMap; //import java.util.HashMap;
import java.util.Iterator; //import java.util.Iterator;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
@Service //@Service
public class ExportUtil { //public class ExportUtil {
public void export(String reportId, short exportType, String fileName, Object data, Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) { // public void export(String reportId, short exportType, String fileName, Object data, Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) {
if (params == null) { // if (params == null) {
params = new HashMap(); // params = new HashMap();
} // }
//
try { // try {
Map<String, ReportModel> reports = ReportInfoReader.getReport(); // Map<String, ReportModel> reports = ReportInfoReader.getReport();
JasperPrint jp = JasperReportUtil.getJasperPrint(reportId, data, (Map)params); // JasperPrint jp = JasperReportUtil.getJasperPrint(reportId, data, (Map)params);
ReportModel rm = (ReportModel)reports.get(reportId); // ReportModel rm = (ReportModel)reports.get(reportId);
if (StringUtils.isBlank(fileName)) { // if (StringUtils.isBlank(fileName)) {
fileName = Function.toUtf8String(rm.getReportName()); // fileName = Function.toUtf8String(rm.getReportName());
} // }
//
if (0 == exportType) { // if (0 == exportType) {
fileName = fileName + ".xlsx"; // fileName = fileName + ".xlsx";
fileName= URLEncoder.encode(fileName,"UTF-8"); // fileName= URLEncoder.encode(fileName,"UTF-8");
this.exportExcel(jp, fileName, response); // this.exportExcel(jp, fileName, response);
} else if (1 == exportType) { // } else if (1 == exportType) {
fileName = fileName + ".pdf"; // fileName = fileName + ".pdf";
fileName= URLEncoder.encode(fileName,"UTF-8"); // fileName= URLEncoder.encode(fileName,"UTF-8");
this.exportPdf(jp, fileName, response); // this.exportPdf(jp, fileName, response);
} else if (3 == exportType) { // } else if (3 == exportType) {
this.exportHtml(jp, response); // this.exportHtml(jp, response);
} // }
} catch (Exception var12) { // } catch (Exception var12) {
var12.printStackTrace(); // var12.printStackTrace();
} // }
//
} // }
protected void exportExcel(Object jasperPrint, String fileName, HttpServletResponse response) { // protected void exportExcel(Object jasperPrint, String fileName, HttpServletResponse response) {
OutputStream out = null; // OutputStream out = null;
//
try { // try {
out = this.getExportStream("application/vnd.ms-excel", fileName, response); // out = this.getExportStream("application/vnd.ms-excel", fileName, response);
JRXlsxExporter exporter = new JRXlsxExporter(); // JRXlsxExporter exporter = new JRXlsxExporter();
ExporterInput exporterInput = null; // ExporterInput exporterInput = null;
if (jasperPrint instanceof JasperPrint) { // if (jasperPrint instanceof JasperPrint) {
exporterInput = new SimpleExporterInput((JasperPrint)jasperPrint); // exporterInput = new SimpleExporterInput((JasperPrint)jasperPrint);
} else if (jasperPrint instanceof List) { // } else if (jasperPrint instanceof List) {
exporterInput = SimpleExporterInput.getInstance((List)jasperPrint); // exporterInput = SimpleExporterInput.getInstance((List)jasperPrint);
} // }
//
exporter.setExporterInput(exporterInput); // exporter.setExporterInput(exporterInput);
OutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(response.getOutputStream()); // OutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(response.getOutputStream());
exporter.setExporterOutput(exporterOutput); // exporter.setExporterOutput(exporterOutput);
exporter.exportReport(); // exporter.exportReport();
} catch (JRException var20) { // } catch (JRException var20) {
var20.getMessage(); // var20.getMessage();
} catch (UnsupportedEncodingException var21) { // } catch (UnsupportedEncodingException var21) {
var21.printStackTrace(); // var21.printStackTrace();
var21.getMessage(); // var21.getMessage();
} catch (IOException var22) { // } catch (IOException var22) {
var22.printStackTrace(); // var22.printStackTrace();
var22.getMessage(); // var22.getMessage();
} finally { // } finally {
if (out != null) { // if (out != null) {
try { // try {
out.flush(); // out.flush();
out.close(); // out.close();
} catch (IOException var19) { // } catch (IOException var19) {
var19.printStackTrace(); // var19.printStackTrace();
} // }
} // }
//
} // }
//
} // }
private void exportPdf(Object jasperPrint, String fileName, HttpServletResponse response) { // private void exportPdf(Object jasperPrint, String fileName, HttpServletResponse response) {
try { // try {
OutputStream ouputStream = this.getExportStream("application/pdf", fileName, response); // OutputStream ouputStream = this.getExportStream("application/pdf", fileName, response);
if (jasperPrint instanceof JasperPrint) { // if (jasperPrint instanceof JasperPrint) {
JasperExportManager.exportReportToPdfStream((JasperPrint)jasperPrint, ouputStream); // JasperExportManager.exportReportToPdfStream((JasperPrint)jasperPrint, ouputStream);
} else if (jasperPrint instanceof List) { // } else if (jasperPrint instanceof List) {
List<JasperPrint> list = (List)jasperPrint; // List<JasperPrint> list = (List)jasperPrint;
if (list != null && list.size() > 0) { // if (list != null && list.size() > 0) {
Iterator var6 = list.iterator(); // Iterator var6 = list.iterator();
//
while(var6.hasNext()) { // while(var6.hasNext()) {
JasperPrint jp = (JasperPrint)var6.next(); // JasperPrint jp = (JasperPrint)var6.next();
JasperExportManager.exportReportToPdfStream(jp, ouputStream); // JasperExportManager.exportReportToPdfStream(jp, ouputStream);
} // }
} // }
} // }
//
ouputStream.flush(); // ouputStream.flush();
ouputStream.close(); // ouputStream.close();
} catch (Exception var8) { // } catch (Exception var8) {
var8.getMessage(); // var8.getMessage();
} // }
//
} // }
protected void exportHtml(Object jasperPrint, HttpServletResponse response) { // protected void exportHtml(Object jasperPrint, HttpServletResponse response) {
PrintWriter printWriter = null; // PrintWriter printWriter = null;
//
try { // try {
response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
response.setContentType("text/html"); // response.setContentType("text/html");
printWriter = response.getWriter(); // printWriter = response.getWriter();
HtmlExporterUtil exporter = new HtmlExporterUtil(jasperPrint, printWriter); // HtmlExporterUtil exporter = new HtmlExporterUtil(jasperPrint, printWriter);
exporter.exportReport(); // exporter.exportReport();
} catch (JRException var9) { // } catch (JRException var9) {
var9.getMessage(); // var9.getMessage();
} catch (IOException var10) { // } catch (IOException var10) {
var10.getMessage(); // var10.getMessage();
} finally { // } finally {
printWriter.close(); // printWriter.close();
} // }
//
} // }
//
protected OutputStream getExportStream(String contentType, String fileName, HttpServletResponse response) { // protected OutputStream getExportStream(String contentType, String fileName, HttpServletResponse response) {
String ct = "application/octet-stream"; // String ct = "application/octet-stream";
if (contentType != null) { // if (contentType != null) {
ct = contentType; // ct = contentType;
} // }
//
ServletOutputStream out = null; // ServletOutputStream out = null;
//
try { // try {
response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
response.setContentType(ct); // response.setContentType(ct);
if (fileName != null && fileName.trim().length() > 0) { // if (fileName != null && fileName.trim().length() > 0) {
response.setHeader("Content-Disposition", "attachment;filename=" + fileName); // response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
} // }
//
response.setBufferSize(2048); // response.setBufferSize(2048);
out = response.getOutputStream(); // out = response.getOutputStream();
} catch (IOException var7) { // } catch (IOException var7) {
var7.getMessage(); // var7.getMessage();
} // }
//
return out; // return out;
} // }
} //}

@ -1,115 +1,115 @@
package org.springblade.desk.energy.util; //package org.springblade.desk.energy.util;
//
import com.videasoft.utils.other.Function; //import com.videasoft.utils.other.Function;
import com.videasoft.utils.reader.PathReader; //import com.videasoft.utils.reader.PathReader;
import com.videasoft.webframework.common.web.report.JasperReportUtils; //import com.videasoft.webframework.common.web.report.JasperReportUtils;
import com.videasoft.webframework.common.web.report.PrintData; //import com.videasoft.webframework.common.web.report.PrintData;
import com.videasoft.webframework.common.web.report.ReportModel; //import com.videasoft.webframework.common.web.report.ReportModel;
import com.videasoft.webframework.common.web.report.SubReportModel; //import com.videasoft.webframework.common.web.report.SubReportModel;
import com.videasoft.webframework.configs.ReportInfoReader; //import com.videasoft.webframework.configs.ReportInfoReader;
import net.sf.jasperreports.engine.JasperFillManager; //import net.sf.jasperreports.engine.JasperFillManager;
import net.sf.jasperreports.engine.JasperPrint; //import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.JasperReport; //import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; //import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import net.sf.jasperreports.engine.util.JRLoader; //import net.sf.jasperreports.engine.util.JRLoader;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import java.io.InputStream; //import java.io.InputStream;
import java.util.*; //import java.util.*;
@Service //@Service
public class JasperReportUtil { //public class JasperReportUtil {
//
//
protected static final Logger logger = LoggerFactory.getLogger(JasperReportUtils.class); // protected static final Logger logger = LoggerFactory.getLogger(JasperReportUtils.class);
//
public JasperReportUtil() { // public JasperReportUtil() {
} // }
//
public static final ReportModel getReportModel(String reportId) throws Exception { // public static final ReportModel getReportModel(String reportId) throws Exception {
return ReportInfoReader.getReportModel(reportId); // return ReportInfoReader.getReportModel(reportId);
} // }
//
public static final JasperPrint getJasperPrint(String reportId, Object data, Map<String, Object> params) throws Exception { // public static final JasperPrint getJasperPrint(String reportId, Object data, Map<String, Object> params) throws Exception {
ReportModel rm = ReportInfoReader.getReportModel(reportId); // ReportModel rm = ReportInfoReader.getReportModel(reportId);
if (rm == null) { // if (rm == null) {
throw new Exception("找不到报表模板定义"); // throw new Exception("找不到报表模板定义");
} else { // } else {
Collection<?> mainData = null; // Collection<?> mainData = null;
if (data instanceof Collection) { // if (data instanceof Collection) {
mainData = (Collection)data; // mainData = (Collection)data;
} else { // } else {
mainData = new ArrayList(1); // mainData = new ArrayList(1);
((List)mainData).add(data); // ((List)mainData).add(data);
} // }
//
if (params == null) { // if (params == null) {
params = new HashMap(); // params = new HashMap();
} // }
//
JasperReport jr = rm.getJasperRoport(); // JasperReport jr = rm.getJasperRoport();
InputStream inputStream = PathReader.class.getResourceAsStream(rm.getTemplatePath()); // InputStream inputStream = PathReader.class.getResourceAsStream(rm.getTemplatePath());
if (inputStream == null) { // if (inputStream == null) {
logger.error("读取打印模版:" + rm.getTemplatePath() + "出错,文件可能不存在!"); // logger.error("读取打印模版:" + rm.getTemplatePath() + "出错,文件可能不存在!");
return null; // return null;
} else { // } else {
if (rm.isDebug() || jr == null) { // if (rm.isDebug() || jr == null) {
jr = (JasperReport) JRLoader.loadObject(inputStream); // jr = (JasperReport) JRLoader.loadObject(inputStream);
rm.setJasperRoport(jr); // rm.setJasperRoport(jr);
} // }
//
if (rm.getExtParam() != null) { // if (rm.getExtParam() != null) {
((Map)params).putAll(rm.getExtParam()); // ((Map)params).putAll(rm.getExtParam());
} // }
//
((Map)params).put("companyInfo", Configer.getEnumConfiger("company").getOption()); // ((Map)params).put("companyInfo", Configer.getEnumConfiger("company").getOption());
SubReportModel subReport = null; // SubReportModel subReport = null;
JasperReport subJS = null; // JasperReport subJS = null;
ReportModel subRM = null; // ReportModel subRM = null;
Collection<?> subData = null; // Collection<?> subData = null;
List<SubReportModel> subReports = rm.getSubReports(); // List<SubReportModel> subReports = rm.getSubReports();
if (subReports != null && subReports.size() > 0) { // if (subReports != null && subReports.size() > 0) {
for(int i = 0; i < subReports.size(); ++i) { // for(int i = 0; i < subReports.size(); ++i) {
subReport = (SubReportModel)subReports.get(i); // subReport = (SubReportModel)subReports.get(i);
subRM = ReportInfoReader.getReportModel(subReport.getSubReportId()); // subRM = ReportInfoReader.getReportModel(subReport.getSubReportId());
subJS = subRM.getJasperRoport(); // subJS = subRM.getJasperRoport();
if (subRM.isDebug() || subJS == null) { // if (subRM.isDebug() || subJS == null) {
subJS = (JasperReport)JRLoader.loadObject(PathReader.class.getResourceAsStream(subRM.getTemplatePath())); // subJS = (JasperReport)JRLoader.loadObject(PathReader.class.getResourceAsStream(subRM.getTemplatePath()));
subRM.setJasperRoport(subJS); // subRM.setJasperRoport(subJS);
} // }
//
subData = (Collection) Function.getPropertyValue(((Map)params).get("jasper_head_data"), subReport.getPropertyName()); // subData = (Collection) Function.getPropertyValue(((Map)params).get("jasper_head_data"), subReport.getPropertyName());
((Map)params).put("subReport_" + subReport.getJsReportParamName(), subJS); // ((Map)params).put("subReport_" + subReport.getJsReportParamName(), subJS);
((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null); // ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null);
} // }
} // }
JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData)); // JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData));
mainData = null; // mainData = null;
subData = null; // subData = null;
if (jp == null) { // if (jp == null) {
throw new Exception("无法生成导出或打印资源!"); // throw new Exception("无法生成导出或打印资源!");
} else { // } else {
return jp; // return jp;
} // }
} // }
} // }
} // }
//
public static final ArrayList<JasperPrint> getJasperPrints(String reportId, List<PrintData> data, Map<String, Object> pubParamMap) throws Exception { // public static final ArrayList<JasperPrint> getJasperPrints(String reportId, List<PrintData> data, Map<String, Object> pubParamMap) throws Exception {
ArrayList<JasperPrint> jps = new ArrayList(data.size()); // ArrayList<JasperPrint> jps = new ArrayList(data.size());
//
for(int i = 0; i < data.size(); ++i) { // for(int i = 0; i < data.size(); ++i) {
PrintData d = (PrintData)data.get(i); // PrintData d = (PrintData)data.get(i);
if (d.getParams() == null) { // if (d.getParams() == null) {
d.setParams(new HashMap()); // d.setParams(new HashMap());
} // }
//
d.getParams().putAll(pubParamMap); // d.getParams().putAll(pubParamMap);
JasperPrint jp = getJasperPrint(reportId, d.getData(), d.getParams()); // JasperPrint jp = getJasperPrint(reportId, d.getData(), d.getParams());
jps.add(jp); // jps.add(jp);
} // }
//
return jps; // return jps;
} // }
} //}

@ -1,8 +1,8 @@
package org.springblade.erpdata; package org.springblade.erpdata;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
/** /**
* Desk启动器 * Desk启动器
@ -13,7 +13,7 @@ import org.springblade.core.launch.constant.AppConstant;
public class ErpDataApplication { public class ErpDataApplication {
public static void main(String[] args) { public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_DESK_NAME, ErpDataApplication.class, args); BladeApplication.run(LauncherConstant.APPLICATION_ERP_DATA_NAME, ErpDataApplication.class, args);
System.out.println("==================="); System.out.println("===================");
System.out.println("==================="); System.out.println("===================");
System.out.println("=======启动成功!===="); System.out.println("=======启动成功!====");

Loading…
Cancel
Save