diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/Test.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/Test.java new file mode 100644 index 0000000..74e24c3 --- /dev/null +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/Test.java @@ -0,0 +1,21 @@ +package com.ailanyin.admin; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; + +import java.util.Date; + +/** + * @author ailanyin + * @version 1.0 + * @since 2022/7/29 0029 上午 8:50 + */ +public class Test { + + public static void main(String[] args) { + DateTime begin = DateUtil.beginOfWeek(new Date()); + DateTime end = DateUtil.endOfWeek(new Date()); + System.out.println(begin.toString("yyyy-MM-dd")); + System.out.println(end.toString("yyyy-MM-dd")); + } +} diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/controller/HxScientificProductionController.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/controller/HxScientificProductionController.java index 07ed804..7f2a60d 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/controller/HxScientificProductionController.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/controller/HxScientificProductionController.java @@ -210,7 +210,7 @@ public class HxScientificProductionController { @ApiOperation(value = "项目管理-型号信息") public AjaxResult getModelYearPlanPic() { HxModelYearPlan yearPlan = new HxModelYearPlan(); - yearPlan.setYear(DateUtil.getNowYear().toString()); + yearPlan.setYear(DateUtil.getNowYear().toString()+"%"); return AjaxResult.success(hxModelYearPlanService.selectList(yearPlan)); } diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDangerousWorkServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDangerousWorkServiceImpl.java index 862ef9a..9201284 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDangerousWorkServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDangerousWorkServiceImpl.java @@ -71,13 +71,13 @@ public class HxDangerousWorkServiceImpl implements HxDangerousWorkService { private Map handleDate(String type) { Map map = new HashMap(2); if (WEEK.equals(type)) { - map.put("start", DateFormatUtils.format(DateUtil.getBeginDayOfWeek(), "yyyyMMdd")); - map.put("end", DateFormatUtils.format(DateUtil.getEndDayOfWeek(), "yyyyMMdd")); + map.put("start", DateFormatUtils.format(DateUtil.getBeginDayOfWeek(), "yyyy-MM-dd")); + map.put("end", DateFormatUtils.format(DateUtil.getEndDayOfWeek(), "yyyy-MM-dd")); } if (MONTH.equals(type)) { - map.put("start", DateFormatUtils.format(DateUtil.getBeginDayOfMonth(), "yyyyMMdd")); - map.put("end", DateFormatUtils.format(DateUtil.getEndDayOfMonth(), "yyyyMMdd")); + map.put("start", DateFormatUtils.format(DateUtil.getBeginDayOfMonth(), "yyyy-MM-dd")); + map.put("end", DateFormatUtils.format(DateUtil.getEndDayOfMonth(), "yyyy-MM-dd")); } return map; diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDeptOperateIndexServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDeptOperateIndexServiceImpl.java index aad32f4..c06bb5a 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDeptOperateIndexServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxDeptOperateIndexServiceImpl.java @@ -1,13 +1,17 @@ package com.ailanyin.admin.service.impl; import com.ailanyin.admin.service.HxDeptOperateIndexService; +import com.ailanyin.admin.service.HxRevenueProfitService; import com.ailanyin.common.utils.DateUtil; import com.ailanyin.common.utils.EmptyUtil; import com.ailanyin.mapper.HxDeptOperateIndexMapper; import com.ailanyin.model.HxDeptOperateIndex; +import com.ailanyin.model.HxRevenueProfit; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,6 +27,8 @@ public class HxDeptOperateIndexServiceImpl implements HxDeptOperateIndexService @Resource private HxDeptOperateIndexMapper hxDeptOperateIndexMapper; + @Autowired + private HxRevenueProfitService hxRevenueProfitService; // type=1全年/2=月度 private static String TYPE_1 = "1"; private static String TYPE_2 = "2"; @@ -34,8 +40,10 @@ public class HxDeptOperateIndexServiceImpl implements HxDeptOperateIndexService @Override public void importData(List list) { + List list1 = new ArrayList<>(); list.forEach(hxDeptOperateIndex -> { if (EmptyUtil.isNotEmpty(hxDeptOperateIndex)) { + list1.add(handleHxRevenueProfit(hxDeptOperateIndex)); if (checkIsExist(hxDeptOperateIndex)) { hxDeptOperateIndexMapper.updateSelective(hxDeptOperateIndex); } else { @@ -43,8 +51,25 @@ public class HxDeptOperateIndexServiceImpl implements HxDeptOperateIndexService } } }); + + hxRevenueProfitService.importData(list1); } + private HxRevenueProfit handleHxRevenueProfit(HxDeptOperateIndex hxDeptOperateIndex) { + HxRevenueProfit profit = new HxRevenueProfit(); + // ======================= + profit.setForecastProfit(hxDeptOperateIndex.getForecastProfit()); + profit.setTargetProfit(hxDeptOperateIndex.getTargetProfit()); + profit.setCompletedProfit(hxDeptOperateIndex.getRealProfit()); + // ======================= + profit.setForecastRevenue(hxDeptOperateIndex.getForecastIncome()); + profit.setTargetRevenue(hxDeptOperateIndex.getTargetIncome()); + profit.setCompletedRevenue(hxDeptOperateIndex.getRealIncome()); + // ======================= + profit.setDeptName(hxDeptOperateIndex.getDeptName()); + profit.setMonth(hxDeptOperateIndex.getMonth()); + return profit; + } @Override public Map getDeptOperateIndexPic(String type,String month) { Map returnMap = new HashMap(2); diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxModelYearPlanServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxModelYearPlanServiceImpl.java index acd600c..0c58fe9 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxModelYearPlanServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxModelYearPlanServiceImpl.java @@ -2,6 +2,7 @@ package com.ailanyin.admin.service.impl; import com.ailanyin.admin.service.HxModelYearPlanService; import com.ailanyin.common.utils.BigDecimalUtil; +import com.ailanyin.common.utils.DateUtil; import com.ailanyin.common.utils.EmptyUtil; import com.ailanyin.mapper.HxModelYearPlanMapper; import com.ailanyin.model.HxModelYearPlan; @@ -24,7 +25,24 @@ public class HxModelYearPlanServiceImpl implements HxModelYearPlanService { @Override public List selectList(HxModelYearPlan hxModelYearPlan) { - return hxModelYearPlanMapper.selectList(hxModelYearPlan); + List list = hxModelYearPlanMapper.select(hxModelYearPlan); + for (HxModelYearPlan plan : list) { + plan.setYear(DateUtil.getNowYear().toString()); + String total = hxModelYearPlanMapper.selectTargetTotal(DateUtil.getNowYear().toString(), plan.getProductModel()); + plan.setTargetCharge(total); + plan.setTargetDeliver(total); + try { + plan.setChargeRate(String.valueOf(BigDecimalUtil.div(plan.getRealCharge(), plan.getTargetCharge(), 2) * 100)); + } catch (Exception e) { + plan.setChargeRate("0"); + } + try { + plan.setDeliverRate(String.valueOf(BigDecimalUtil.div(plan.getRealDeliver(), plan.getTargetDeliver(), 2) * 100)); + } catch (Exception e) { + plan.setDeliverRate("0"); + } + } + return list; } @Override diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthFactoryPlanServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthFactoryPlanServiceImpl.java index 5ad49b4..6b9083b 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthFactoryPlanServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthFactoryPlanServiceImpl.java @@ -24,7 +24,7 @@ public class HxMonthFactoryPlanServiceImpl implements HxMonthFactoryPlanService @Override public List selectList(HxMonthFactoryPlan hxMonthFactoryPlan) { - return hxMonthFactoryPlanMapper.selectList(hxMonthFactoryPlan); + return hxMonthFactoryPlanMapper.select(hxMonthFactoryPlan); } @Override diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthPlanServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthPlanServiceImpl.java index fa22e72..72afbdd 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthPlanServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxMonthPlanServiceImpl.java @@ -23,7 +23,30 @@ public class HxMonthPlanServiceImpl implements HxMonthPlanService { @Override public List selectList(HxMonthPlan hxMonthPlan) { - return hxMonthPlanMapper.selectList(hxMonthPlan); + List list = null; + if (hxMonthPlan.getMonth() != null) { + list = hxMonthPlanMapper.selectByMonth(hxMonthPlan); + } else { + list = hxMonthPlanMapper.selectAll(hxMonthPlan); + } + for (HxMonthPlan plan : list) { + try { + plan.setDeliverRate(String.valueOf(BigDecimalUtil.div(plan.getRealDeliver(), plan.getTargetDeliver(), 2) * 100)); + } catch (Exception e) { + plan.setDeliverRate("0"); + } + try { + plan.setChargeRate(String.valueOf(BigDecimalUtil.div(plan.getRealCharge(), plan.getTargetCharge(), 2) * 100)); + } catch (Exception e) { + plan.setChargeRate("0"); + } + try { + plan.setAssembleRate(String.valueOf(BigDecimalUtil.div(plan.getRealAssemble(), plan.getTargetAssemble(), 2) * 100)); + } catch (Exception e) { + plan.setAssembleRate("0"); + } + } + return list; } @Override diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductCompletionOverviewServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductCompletionOverviewServiceImpl.java index 33c01c4..7c48a32 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductCompletionOverviewServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductCompletionOverviewServiceImpl.java @@ -2,7 +2,9 @@ package com.ailanyin.admin.service.impl; import com.ailanyin.admin.service.HxProductCompletionOverviewService; import com.ailanyin.common.utils.BigDecimalUtil; +import com.ailanyin.common.utils.DateUtil; import com.ailanyin.common.utils.EmptyUtil; +import com.ailanyin.mapper.HxModelYearPlanMapper; import com.ailanyin.mapper.HxProductCompletionOverviewMapper; import com.ailanyin.model.HxProductCompletionOverview; import org.springframework.stereotype.Service; @@ -22,7 +24,8 @@ public class HxProductCompletionOverviewServiceImpl implements HxProductCompleti @Resource private HxProductCompletionOverviewMapper completionOverviewMapper; - + @Resource + private HxModelYearPlanMapper hxModelYearPlanMapper; /** * 红峡交付产品完成概况列表 * @@ -31,7 +34,17 @@ public class HxProductCompletionOverviewServiceImpl implements HxProductCompleti */ @Override public List selectHxProductCompletionOverviewList(HxProductCompletionOverview completionOverview) { - return completionOverviewMapper.selectHxProductCompletionOverviewList(completionOverview); + List list = completionOverviewMapper.selectList(completionOverview); + for (HxProductCompletionOverview overview : list) { + try { + String total = hxModelYearPlanMapper.selectTargetTotal(overview.getMonth().substring(0,4), overview.getProductName()); + overview.setTargetDeliveryQuantity(total); + overview.setCompletionRate(String.valueOf(BigDecimalUtil.div(overview.getActualDeliveryQuantity(),total,2) * 100)); + } catch (Exception e) { + overview.setCompletionRate("0"); + } + } + return list; } /** diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductionResponsibilityServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductionResponsibilityServiceImpl.java index 3edec67..d11d9e3 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductionResponsibilityServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxProductionResponsibilityServiceImpl.java @@ -4,6 +4,7 @@ import com.ailanyin.admin.service.HxProductionResponsibilityService; import com.ailanyin.common.utils.BigDecimalUtil; import com.ailanyin.common.utils.DateUtil; import com.ailanyin.common.utils.EmptyUtil; +import com.ailanyin.mapper.HxModelYearPlanMapper; import com.ailanyin.mapper.HxProductionResponsibilityMapper; import com.ailanyin.model.HxProductionResponsibility; import org.springframework.stereotype.Service; @@ -47,14 +48,28 @@ public class HxProductionResponsibilityServiceImpl implements HxProductionRespon list.forEach(this::handleData); } + @Resource + private HxModelYearPlanMapper hxModelYearPlanMapper; + @Override public Map getPic() { - String year = DateUtil.getNowYear() + "-%"; + + String year = DateUtil.getNowYear().toString(); + List mapList = responsibilityMapper.getCategoryAndTotal(year + "-%"); + for (Map map : mapList) { + String model = map.get("translateName").toString(); + String completedTotal = map.get("completedTaskNumber").toString(); + String total = hxModelYearPlanMapper.selectTargetTotal(year, model); + try { + map.put("completionRate",BigDecimalUtil.div(completedTotal,total,2)); + } catch (Exception e) { + map.put("completionRate","0"); + } + } Map map = new HashMap(2); - HxProductionResponsibility responsibility = new HxProductionResponsibility(); - responsibility.setMonth(year); - map.put("list",selectHxProductionResponsibilityList(responsibility)); - map.put("rate",responsibilityMapper.getRateByYear(year)); + + map.put("list",mapList); + map.put("rate",responsibilityMapper.getRateByYear(year+"%")); return map; } diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxWorkHomeInfoServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxWorkHomeInfoServiceImpl.java index 84b3670..08499bf 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxWorkHomeInfoServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxWorkHomeInfoServiceImpl.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.List; /** @@ -43,7 +44,11 @@ public class HxWorkHomeInfoServiceImpl implements HxWorkHomeInfoService { public void importData(List list) { list.forEach(hxWorkHomeInfo -> { if (EmptyUtil.isNotEmpty(hxWorkHomeInfo.getWorkHomeName())) { - hxWorkHomeInfoMapper.insertSelective(hxWorkHomeInfo); + if (checkIsExist(hxWorkHomeInfo)) { + hxWorkHomeInfoMapper.updateSelective(hxWorkHomeInfo); + } else { + hxWorkHomeInfoMapper.insertSelective(hxWorkHomeInfo); + } handleRtmpToVideo(hxWorkHomeInfo); } }); @@ -51,13 +56,18 @@ public class HxWorkHomeInfoServiceImpl implements HxWorkHomeInfoService { @Override public List getHxWorkHomePic() { - List list = selectList(new HxWorkHomeInfo()); + HxWorkHomeInfo info = new HxWorkHomeInfo(); + info.setWorkFlag("是"); + List list = selectList(info); list.forEach(hxWorkHomeInfo -> { if (redisService.hasKey(database + ":rtmp:hxWorkHomeInfo" + hxWorkHomeInfo.getId())) { String url = redisService.get(database + ":rtmp:hxWorkHomeInfo" + hxWorkHomeInfo.getId()).toString(); hxWorkHomeInfo.setAvAddress(url); } - hxWorkHomeInfo.setUserList(hxWorkHomeInfoMapper.getWorkshopAllUserByName(hxWorkHomeInfo.getWorkshop())); + + if (hxWorkHomeInfo.getUsers() != null) { + hxWorkHomeInfo.setUserList(Arrays.asList(hxWorkHomeInfo.getUsers().split(","))); + } }); return list; } @@ -65,7 +75,7 @@ public class HxWorkHomeInfoServiceImpl implements HxWorkHomeInfoService { @Override public void handleRtmpToVideo(HxWorkHomeInfo hxWorkHomeInfo) { if (EmptyUtil.isNotEmpty(hxWorkHomeInfo.getId()) && EmptyUtil.isNotEmpty(hxWorkHomeInfo.getAvAddress())) { - System.out.println("开始推: " +hxWorkHomeInfo.getWorkHomeName() +" 工房"); + System.out.println("开始推: " + hxWorkHomeInfo.getWorkHomeName() + " 工房"); String[] cmd = new String[]{"sh", "-c", "nohup ffmpeg -re -i " + hxWorkHomeInfo.getAvAddress() + " -vcodec copy -acodec copy -f flv -y rtmp://127.0.0.1:1935/live/hxWorkHomeInfo" + hxWorkHomeInfo.getId() + " >/opt/null 2>&1 &"}; try { Runtime.getRuntime().exec(cmd); @@ -74,7 +84,7 @@ public class HxWorkHomeInfoServiceImpl implements HxWorkHomeInfoService { } try { - String url = "http://" + IpUtil.getLocalIp() + "/stream/live/hxWorkHomeInfo" + hxWorkHomeInfo.getId()+".flv"; + String url = "http://" + IpUtil.getLocalIp() + "/stream/live/hxWorkHomeInfo" + hxWorkHomeInfo.getId() + ".flv"; redisService.set(database + ":rtmp:hxWorkHomeInfo" + hxWorkHomeInfo.getId(), url); } catch (UnknownHostException e) { e.printStackTrace(); diff --git a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxYearDutyServiceImpl.java b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxYearDutyServiceImpl.java index 570d15b..eaa2c86 100644 --- a/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxYearDutyServiceImpl.java +++ b/ailanyin-admin/src/main/java/com/ailanyin/admin/service/impl/HxYearDutyServiceImpl.java @@ -25,7 +25,15 @@ public class HxYearDutyServiceImpl implements HxYearDutyService { @Override public List selectList(HxYearDuty hxYearDuty) { - return hxYearDutyMapper.selectList(hxYearDuty); + List list = hxYearDutyMapper.selectList(hxYearDuty); + for (HxYearDuty duty : list) { + Integer total = hxYearDutyMapper.selectRealTotal(duty.getYear()+'%',duty.getProductModel()); + if (total == null) { + total = 0; + } + duty.setRate(String.valueOf(BigDecimalUtil.div(Double.valueOf(total),Double.valueOf(duty.getTargetTotal()),2) * 100)); + } + return list; } @Override diff --git a/ailanyin-admin/src/main/resources/sql/hx_production_plan_0.sql b/ailanyin-admin/src/main/resources/sql/hx_production_plan_0.sql deleted file mode 100644 index 523624e..0000000 --- a/ailanyin-admin/src/main/resources/sql/hx_production_plan_0.sql +++ /dev/null @@ -1,35 +0,0 @@ -drop table "ROOT"."hx_production_plan"; -CREATE TABLE "ROOT"."hx_production_plan" -( -"id" BIGINT IDENTITY(1, 1) NOT NULL, -"month" VARCHAR(255), -"product_model" VARCHAR(255), -"real_adiabat" VARCHAR(255), -"real_charge" VARCHAR(255), -"real_assembly" VARCHAR(255), -"real_deliver" VARCHAR(255), -"forecast_adiabat" VARCHAR(255), -"forecast_charge" VARCHAR(255), -"forecast_assembly" VARCHAR(255), -"forecast_deliver" VARCHAR(255), -"review" VARCHAR(255), -"settlement" VARCHAR(255), -"production_number" VARCHAR(255), -NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "AITEST", CLUSTERBTR) ; - -COMMENT ON COLUMN "ROOT"."hx_production_plan"."forecast_adiabat" IS 'Ԥ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."forecast_assembly" IS 'Ԥװ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."forecast_charge" IS 'Ԥװҩ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."forecast_deliver" IS 'Ԥ⽻'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."product_model" IS 'Ʒͺ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."production_number" IS ''; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."real_adiabat" IS 'ʵʾ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."real_assembly" IS 'ʵװ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."real_charge" IS 'ʵװҩ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."real_deliver" IS 'ʵʽ'; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."review" IS ''; -COMMENT ON COLUMN "ROOT"."hx_production_plan"."settlement" IS ''; - - -CREATE UNIQUE INDEX "INDEX356532075240600" ON "ROOT"."hx_production_plan"("id" ASC) STORAGE(ON "AITEST", CLUSTERBTR) ; - diff --git a/ailanyin-admin/src/main/resources/sql/hx_reader_info_1.sql b/ailanyin-admin/src/main/resources/sql/hx_reader_info_1.sql deleted file mode 100644 index 1eda383..0000000 --- a/ailanyin-admin/src/main/resources/sql/hx_reader_info_1.sql +++ /dev/null @@ -1,31 +0,0 @@ -drop table "ROOT"."hx_reader_info"; -CREATE TABLE "ROOT"."hx_reader_info" -( -"id" BIGINT NOT NULL, -"reader_name" VARCHAR(255), -"abscissa" INT, -"ordinate" INT, -"north_angle" INT, -"reader_ip" VARCHAR(255), -"reader_port" INT, -"record_distance" INT, -"create_time" TIMESTAMP(0), -NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "AITEST", CLUSTERBTR) ; - -COMMENT ON TABLE "ROOT"."hx_reader_info" IS '读卡器'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."abscissa" IS '横坐标'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."create_time" IS '录入时间'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."id" IS 'ID'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."north_angle" IS '与正北夹角'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."ordinate" IS '纵坐标'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."reader_ip" IS '读卡器静态ip'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."reader_name" IS '读卡器名称'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."reader_port" IS '读卡器端口'; -COMMENT ON COLUMN "ROOT"."hx_reader_info"."record_distance" IS '进出工房设置距离'; - - -CREATE UNIQUE INDEX "INDEX6215806402700" ON "ROOT"."hx_reader_info"("id" ASC) STORAGE(ON "AITEST", CLUSTERBTR) ; - - - - diff --git a/ailanyin-admin/src/main/resources/sql/hx_responsibility_status_0.sql b/ailanyin-admin/src/main/resources/sql/hx_responsibility_status_0.sql new file mode 100644 index 0000000..0583744 --- /dev/null +++ b/ailanyin-admin/src/main/resources/sql/hx_responsibility_status_0.sql @@ -0,0 +1,21 @@ +drop table "ROOT"."hx_responsibility_status"; + +CREATE TABLE "ROOT"."hx_responsibility_status" +( +"id" BIGINT IDENTITY(1, 1) NOT NULL, +"responsibility_content" VARCHAR(255), +"progress_status" VARCHAR(255), +"completion_status" VARCHAR(255), +"dept_name" VARCHAR(255), +"month" CHAR(30), +NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "AITEST", CLUSTERBTR) ; + +COMMENT ON COLUMN "ROOT"."hx_responsibility_status"."completion_status" IS ''; +COMMENT ON COLUMN "ROOT"."hx_responsibility_status"."dept_name" IS ''; +COMMENT ON COLUMN "ROOT"."hx_responsibility_status"."month" IS '·'; +COMMENT ON COLUMN "ROOT"."hx_responsibility_status"."progress_status" IS 'չ'; +COMMENT ON COLUMN "ROOT"."hx_responsibility_status"."responsibility_content" IS ''; + + +CREATE UNIQUE INDEX "INDEX8279916944200" ON "ROOT"."hx_responsibility_status"("id" ASC) STORAGE(ON "AITEST", CLUSTERBTR) ; + diff --git a/ailanyin-admin/src/main/resources/sql/hx_table_0.sql b/ailanyin-admin/src/main/resources/sql/hx_table_0.sql new file mode 100644 index 0000000..733e436 --- /dev/null +++ b/ailanyin-admin/src/main/resources/sql/hx_table_0.sql @@ -0,0 +1,14 @@ +drop table if exists "ROOT"."hx_table"; + +CREATE TABLE "ROOT"."hx_table" +( +"name" VARCHAR(50), +"sql" TEXT, +"table" VARCHAR(50), +UNIQUE("name")) STORAGE(ON "AITEST", CLUSTERBTR) ; + +COMMENT ON COLUMN "ROOT"."hx_table"."name" IS ''; +COMMENT ON COLUMN "ROOT"."hx_table"."sql" IS 'ִеsql'; +COMMENT ON COLUMN "ROOT"."hx_table"."table" IS ''; + + diff --git a/ailanyin-admin/src/main/resources/sql/hx_work_home_info_0.sql b/ailanyin-admin/src/main/resources/sql/hx_work_home_info_0.sql new file mode 100644 index 0000000..b5ed8ef --- /dev/null +++ b/ailanyin-admin/src/main/resources/sql/hx_work_home_info_0.sql @@ -0,0 +1,20 @@ +drop table if exists "ROOT"."hx_work_home_info"; +CREATE TABLE "ROOT"."hx_work_home_info" +( +"id" BIGINT IDENTITY(1, 1) NOT NULL, +"work_home_name" VARCHAR(255), +"abscissa" VARCHAR(255), +"ordinate" VARCHAR(255), +"workshop" VARCHAR(255), +"job_content" VARCHAR(255), +"error_info" VARCHAR(255), +"av_address" VARCHAR(255), +"users" VARCHAR(1000), +"work_flag" VARCHAR(50), +NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "AITEST", CLUSTERBTR) ; + +COMMENT ON COLUMN "ROOT"."hx_work_home_info"."work_home_name" IS ''; + + +CREATE UNIQUE INDEX "INDEX555455965509700" ON "ROOT"."hx_work_home_info"("id" ASC) STORAGE(ON "AITEST", CLUSTERBTR) ; + diff --git a/ailanyin-common/src/main/java/com/ailanyin/common/utils/FileUtil.java b/ailanyin-common/src/main/java/com/ailanyin/common/utils/FileUtil.java index 2934544..defc9da 100644 --- a/ailanyin-common/src/main/java/com/ailanyin/common/utils/FileUtil.java +++ b/ailanyin-common/src/main/java/com/ailanyin/common/utils/FileUtil.java @@ -1,8 +1,8 @@ package com.ailanyin.common.utils; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.UUID; import com.ailanyin.common.exception.Asserts; -import com.alibaba.fastjson.util.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -91,8 +91,8 @@ public class FileUtil { } catch (IOException e) { throw e; } finally { - IOUtils.close(os); - IOUtils.close(fis); + IoUtil.close(os); + IoUtil.close(fis); } } @@ -261,7 +261,7 @@ public class FileUtil { String filePath = FileUtil.class.getProtectionDomain().getCodeSource().getLocation().getFile(); String jarPath = filePath.split(".jar!")[0]; jarPath = jarPath.split("file:")[1]; - return jarPath.substring(0,jarPath.lastIndexOf("/")); + return jarPath.substring(0, jarPath.lastIndexOf("/")); } catch (Exception e) { File desc = new File("/opt/jar"); if (!desc.exists()) { diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxModelYearPlanMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxModelYearPlanMapper.java index 529cb41..a29751d 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxModelYearPlanMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxModelYearPlanMapper.java @@ -1,6 +1,8 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxModelYearPlan; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -12,9 +14,12 @@ import java.util.List; public interface HxModelYearPlanMapper { int checkIsExist(HxModelYearPlan hxModelYearPlan); - List selectList(HxModelYearPlan hxModelYearPlan); + List select(HxModelYearPlan hxModelYearPlan); void insertSelective(HxModelYearPlan hxModelYearPlan); void updateSelective(HxModelYearPlan hxModelYearPlan); + + String selectTargetTotal(@Param("year") String year,@Param("model") String productModel); + } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthFactoryPlanMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthFactoryPlanMapper.java index 61ebb54..654af52 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthFactoryPlanMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthFactoryPlanMapper.java @@ -1,6 +1,8 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxMonthFactoryPlan; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,8 +11,10 @@ import java.util.List; * @version 1.0 * @since 2021/12/22 0022 下午 16:30 */ +@Mapper public interface HxMonthFactoryPlanMapper { - List selectList(HxMonthFactoryPlan hxMonthFactoryPlan); + + List select(HxMonthFactoryPlan hxMonthFactoryPlan); void updateSelective(HxMonthFactoryPlan hxMonthFactoryPlan); diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthPlanMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthPlanMapper.java index 7f13c3c..b2b08c1 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthPlanMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxMonthPlanMapper.java @@ -1,6 +1,7 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxMonthPlan; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -17,4 +18,25 @@ public interface HxMonthPlanMapper { void updateSelective(HxMonthPlan hxMonthPlan); void insertSelective(HxMonthPlan hxMonthPlan); + + @Select("select \"month\", \"product_model\" as \"model\",\"ascription\",\n" + + "\"real_deliver\" as \"realDeliver\",\n" + + "\"real_assembly\" as \"realAssemble\",\n" + + "\"real_charge\" as \"realCharge\",\n" + + "\"forecast_deliver\" as \"targetDeliver\",\n" + + "\"forecast_assembly\" as \"targetAssemble\",\n" + + "\"forecast_charge\" as \"targetCharge\"\n" + + "from ROOT.\"hx_production_plan\"\n" + + "where \"month\" = #{month}") + List selectByMonth(HxMonthPlan hxMonthPlan); + + @Select("select \"month\", \"product_model\" as \"model\",\"ascription\",\n" + + "\"real_deliver\" as \"realDeliver\",\n" + + "\"real_assembly\" as \"realAssemble\",\n" + + "\"real_charge\" as \"realCharge\",\n" + + "\"forecast_deliver\" as \"targetDeliver\",\n" + + "\"forecast_assembly\" as \"targetAssemble\",\n" + + "\"forecast_charge\" as \"targetCharge\"\n" + + "from ROOT.\"hx_production_plan\"") + List selectAll(HxMonthPlan hxMonthPlan); } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductCompletionOverviewMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductCompletionOverviewMapper.java index 6f1ac47..55e4f50 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductCompletionOverviewMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductCompletionOverviewMapper.java @@ -2,6 +2,7 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxProductCompletionOverview; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -49,4 +50,6 @@ public interface HxProductCompletionOverviewMapper { * @param id id */ void delHxProductCompletionOverviewById(Long id); + + List selectList(HxProductCompletionOverview completionOverview); } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductionResponsibilityMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductionResponsibilityMapper.java index 8e733ed..31ed916 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductionResponsibilityMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxProductionResponsibilityMapper.java @@ -3,6 +3,7 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxProductionResponsibility; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -47,4 +48,10 @@ public interface HxProductionResponsibilityMapper { void insertSelective(HxProductionResponsibility productionResponsibility); Map getRateByYear(String year); + + @Select("select \"translate_name\" as \"translateName\",sum(\"completed_task_number\") as \"completedTaskNumber\"\n" + + "from ROOT.\"hx_production_responsibility\"\n" + + "where \"month\" like #{year}\n" + + "group by \"translate_name\"") + List getCategoryAndTotal(String year); } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxYearDutyMapper.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxYearDutyMapper.java index f80c169..1eb4b2d 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxYearDutyMapper.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxYearDutyMapper.java @@ -1,6 +1,9 @@ package com.ailanyin.mapper; import com.ailanyin.model.HxYearDuty; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -9,6 +12,7 @@ import java.util.List; * @version 1.0 * @since 2021/12/22 0022 下午 14:40 */ +@Mapper public interface HxYearDutyMapper { int checkIsExist(HxYearDuty hxYearDuty); @@ -17,4 +21,7 @@ public interface HxYearDutyMapper { void updateSelective(HxYearDuty hxYearDuty); void insertSelective(HxYearDuty hxYearDuty); + + @Select("select sum(\"assembly\") from ROOT.\"actual_production_base\" where \"month\" like #{year} and \"model\" = #{model}") + Integer selectRealTotal(@Param("year") String year, @Param("model") String model); } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxProductionPlan.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxProductionPlan.java index 4619c54..6d21a43 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxProductionPlan.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxProductionPlan.java @@ -28,24 +28,27 @@ public class HxProductionPlan implements Serializable { @ApiModelProperty(value = "绝热数量") @Excel(name = "实际绝热数量", width = 20) private String realAdiabat; - @Excel(name = "预测绝热数量", width = 20) - private String forecastAdiabat; - - @ApiModelProperty(value = "装药数量") @Excel(name = "实际装药数量", width = 20) private String realCharge; + @Excel(name = "实际总装数量", width = 20) + private String realAssembly; + + @Excel(name = "实际交付数量", width = 20) + private String realDeliver; + @ApiModelProperty(value = "装药数量") + + @Excel(name = "预测绝热数量", width = 20) + private String forecastAdiabat; @Excel(name = "预测装药数量", width = 20) private String forecastCharge; @ApiModelProperty(value = "总装数量") - @Excel(name = "实际总装数量", width = 20) - private String realAssembly; + @Excel(name = "预测总装数量", width = 20) private String forecastAssembly; @ApiModelProperty(value = "交付数量") - @Excel(name = "实际交付数量", width = 20) - private String realDeliver; + @Excel(name = "预测交付数量", width = 20) private String forecastDeliver; @@ -61,5 +64,9 @@ public class HxProductionPlan implements Serializable { @Excel(name = "生产数量", width = 20) private String productionNumber; + @ApiModelProperty(value = "计划归属") + @Excel(name = "计划归属", width = 20) + private String ascription; + private static final long serialVersionUID = 1L; } diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxResponsibilityStatus.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxResponsibilityStatus.java index f9eb05d..2d4c248 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxResponsibilityStatus.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxResponsibilityStatus.java @@ -17,6 +17,10 @@ public class HxResponsibilityStatus implements Serializable { private Long id; + @ApiModelProperty(value = "月份") + @Excel(name = "月份", width = 20) + private String month; + @ApiModelProperty(value = "责任令内容") @Excel(name = "责任令内容", width = 20) private String responsibilityContent; diff --git a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxWorkHomeInfo.java b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxWorkHomeInfo.java index 3fbcf08..aae6db7 100644 --- a/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxWorkHomeInfo.java +++ b/ailanyin-model-mapper/src/main/java/com/ailanyin/model/HxWorkHomeInfo.java @@ -35,6 +35,10 @@ public class HxWorkHomeInfo implements Serializable { @Excel(name = "车间名称", width = 20) private String workshop; + @ApiModelProperty(value = "是否正在作业") + @Excel(name = "是否正在作业(是/否)", width = 25) + private String workFlag; + @ApiModelProperty(value = "作业内容") @Excel(name = "作业内容", width = 20) private String jobContent; @@ -49,7 +53,11 @@ public class HxWorkHomeInfo implements Serializable { private boolean flag = false; - private List userList; + @ApiModelProperty(value = "作业人员") + @Excel(name = "作业人员", width = 30) + private String users; + + private List userList; private static final long serialVersionUID = 1L; } diff --git a/ailanyin-model-mapper/src/main/resources/com/ailanyin/mapper/HxModelYearPlanMapper.xml b/ailanyin-model-mapper/src/main/resources/com/ailanyin/mapper/HxModelYearPlanMapper.xml index 229ef53..211d3ba 100644 --- a/ailanyin-model-mapper/src/main/resources/com/ailanyin/mapper/HxModelYearPlanMapper.xml +++ b/ailanyin-model-mapper/src/main/resources/com/ailanyin/mapper/HxModelYearPlanMapper.xml @@ -26,6 +26,18 @@ "id", "year", "product_model", "real_charge", "target_charge", "charge_rate", "real_deliver", "target_deliver", "deliver_rate" + + + select @@ -69,6 +70,9 @@ "dept_name", + + "month", + @@ -86,6 +90,9 @@ #{deptName,jdbcType=VARCHAR}, + + #{month,jdbcType=VARCHAR}, + @@ -94,7 +101,7 @@ This element is automatically generated by MyBatis Generator, do not modify. This element was generated on Tue Dec 14 02:43:38 UTC 2021. --> - update "hx_responsibility_status" + update ROOT."hx_responsibility_status" "progress_status" = #{progressStatus,jdbcType=VARCHAR}, @@ -103,7 +110,7 @@ "completion_status" = #{completionStatus,jdbcType=VARCHAR}, - where "dept_name" = #{deptName} and "responsibility_content" = #{responsibilityContent} + where "dept_name" = #{deptName} and "responsibility_content" = #{responsibilityContent} and "month" = #{month} "id", "work_home_name", "abscissa", "ordinate", "workshop", "job_content", "error_info", - "av_address" + "av_address","work_flag","users"