From 143adbc8227ab343731ffa496b2067ef2492425c Mon Sep 17 00:00:00 2001 From: ddmt Date: Mon, 18 Nov 2024 20:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=B7=A5=E5=8E=82=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/compiler.xml | 28 ++++ .idea/dataSources.xml | 12 ++ .idea/encodings.xml | 37 +++++ .idea/jarRepositories.xml | 25 +++ .idea/misc.xml | 12 ++ .idea/sqldialects.xml | 7 + .idea/vcs.xml | 6 + .../domain/CfElectricCheckpoint.java | 121 ++++++++++++++ .../mapper/CfElectricCheckpointMapper.java | 61 +++++++ .../service/ICfElectricCheckpointService.java | 61 +++++++ .../impl/CfElectricCheckpointServiceImpl.java | 95 +++++++++++ .../domain/CfElectricCheckpoint.class | Bin 0 -> 2940 bytes .../mapper/CfElectricCheckpointMapper.class | Bin 0 -> 810 bytes .../ICfElectricCheckpointService.class | Bin 0 -> 815 bytes .../CfElectricCheckpointServiceImpl.class | Bin 0 -> 2237 bytes .../controller/MesFactoryModelController.java | 149 ++++++++++++++++++ .../carbon/mes/domain/MesFactoryModel.java | 100 ++++++++++++ .../com/neu/carbon/mes/domain/MesProject.java | 136 ++++++++++++++++ .../mes/mapper/MesFactoryModelMapper.java | 83 ++++++++++ .../carbon/mes/mapper/MesProjectMapper.java | 61 +++++++ .../mes/service/IMesFactoryModelService.java | 61 +++++++ .../mes/service/IMesProjectService.java | 61 +++++++ .../impl/MesFactoryModelServiceImpl.java | 103 ++++++++++++ .../service/impl/MesProjectServiceImpl.java | 93 +++++++++++ .../mapper/mes/MesFactoryModelMapper.xml | 83 ++++++++++ .../MesFactoryModelController.class | Bin 0 -> 6518 bytes .../carbon/mes/domain/MesFactoryModel.class | Bin 0 -> 2633 bytes .../neu/carbon/mes/domain/MesProject.class | Bin 0 -> 3191 bytes .../mes/mapper/MesFactoryModelMapper.class | Bin 0 -> 956 bytes .../carbon/mes/mapper/MesProjectMapper.class | Bin 0 -> 644 bytes .../mes/service/IMesFactoryModelService.class | Bin 0 -> 714 bytes .../mes/service/IMesProjectService.class | Bin 0 -> 649 bytes .../impl/MesFactoryModelServiceImpl.class | Bin 0 -> 2180 bytes .../service/impl/MesProjectServiceImpl.class | Bin 0 -> 1774 bytes .../mapper/mes/MesFactoryModelMapper.xml | 83 ++++++++++ .../neu/common/utils/http/HttpUtils$1.class | Bin 0 -> 227 bytes 37 files changed, 1486 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/dataSources.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/sqldialects.xml create mode 100644 .idea/vcs.xml create mode 100644 neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/domain/CfElectricCheckpoint.java create mode 100644 neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.java create mode 100644 neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/ICfElectricCheckpointService.java create mode 100644 neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/impl/CfElectricCheckpointServiceImpl.java create mode 100644 neu-carbon-footprint/target/classes/com/neu/carbon/footprint/domain/CfElectricCheckpoint.class create mode 100644 neu-carbon-footprint/target/classes/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.class create mode 100644 neu-carbon-footprint/target/classes/com/neu/carbon/footprint/service/ICfElectricCheckpointService.class create mode 100644 neu-carbon-footprint/target/classes/com/neu/carbon/footprint/service/impl/CfElectricCheckpointServiceImpl.class create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/controller/MesFactoryModelController.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesFactoryModel.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesProject.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesFactoryModelMapper.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesProjectMapper.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesFactoryModelService.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesProjectService.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.java create mode 100644 neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesProjectServiceImpl.java create mode 100644 neu-carbon-mes/src/main/resources/mapper/mes/MesFactoryModelMapper.xml create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/controller/MesFactoryModelController.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/domain/MesFactoryModel.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/domain/MesProject.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/mapper/MesFactoryModelMapper.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/mapper/MesProjectMapper.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesFactoryModelService.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesProjectService.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.class create mode 100644 neu-carbon-mes/target/classes/com/neu/carbon/mes/service/impl/MesProjectServiceImpl.class create mode 100644 neu-carbon-mes/target/classes/mapper/mes/MesFactoryModelMapper.xml create mode 100644 neu-common/target/classes/com/neu/common/utils/http/HttpUtils$1.class diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..5442b11 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..c0a0aff --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306/carbon + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..cd1ae33 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..dfaf1c0 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5cd614 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..905d1f7 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/domain/CfElectricCheckpoint.java b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/domain/CfElectricCheckpoint.java new file mode 100644 index 0000000..9c937b7 --- /dev/null +++ b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/domain/CfElectricCheckpoint.java @@ -0,0 +1,121 @@ +package com.neu.carbon.footprint.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.neu.common.annotation.Excel; +import com.neu.common.core.domain.BaseEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 能效检测点对象 cf_electric_checkpoint + * + * @author neuedu + * @date 2024-11-16 + */ +@ApiModel("能效检测点") +public class CfElectricCheckpoint extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + @ApiModelProperty("编号") + @Excel(name = "编号") + private Long id; + + /** 站点名称 */ + @ApiModelProperty("站点名称") + @Excel(name = "站点名称") + private String name; + + /** 站点地址 */ + @ApiModelProperty("站点地址") + @Excel(name = "站点地址") + private String address; + + /** 实时功率 */ + @ApiModelProperty("实时功率") + @Excel(name = "实时功率") + private Long rtPower; + + /** 实时电压 */ + @ApiModelProperty("实时电压") + @Excel(name = "实时电压") + private Long rtVoltage; + + /** 状态 0未过载 1已过载 */ + @ApiModelProperty("状态 0未过载 1已过载") + @Excel(name = "状态 0未过载 1已过载") + private String status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setRtPower(Long rtPower) + { + this.rtPower = rtPower; + } + + public Long getRtPower() + { + return rtPower; + } + public void setRtVoltage(Long rtVoltage) + { + this.rtVoltage = rtVoltage; + } + + public Long getRtVoltage() + { + return rtVoltage; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("address", getAddress()) + .append("rtPower", getRtPower()) + .append("rtVoltage", getRtVoltage()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.java b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.java new file mode 100644 index 0000000..9ccd1f4 --- /dev/null +++ b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.java @@ -0,0 +1,61 @@ +package com.neu.carbon.footprint.mapper; + +import java.util.List; +import com.neu.carbon.footprint.domain.CfElectricCheckpoint; + +/** + * 能效检测点Mapper接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface CfElectricCheckpointMapper +{ + /** + * 查询能效检测点 + * + * @param id 能效检测点ID + * @return 能效检测点 + */ + public CfElectricCheckpoint selectCfElectricCheckpointById(Long id); + + /** + * 查询能效检测点列表 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 能效检测点集合 + */ + public List selectCfElectricCheckpointList(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 新增能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + public int insertCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 修改能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + public int updateCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 删除能效检测点 + * + * @param id 能效检测点ID + * @return 结果 + */ + public int deleteCfElectricCheckpointById(Long id); + + /** + * 批量删除能效检测点 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteCfElectricCheckpointByIds(Long[] ids); +} diff --git a/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/ICfElectricCheckpointService.java b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/ICfElectricCheckpointService.java new file mode 100644 index 0000000..dedeb46 --- /dev/null +++ b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/ICfElectricCheckpointService.java @@ -0,0 +1,61 @@ +package com.neu.carbon.footprint.service; + +import java.util.List; +import com.neu.carbon.footprint.domain.CfElectricCheckpoint; + +/** + * 能效检测点Service接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface ICfElectricCheckpointService +{ + /** + * 查询能效检测点 + * + * @param id 能效检测点ID + * @return 能效检测点 + */ + public CfElectricCheckpoint selectCfElectricCheckpointById(Long id); + + /** + * 查询能效检测点列表 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 能效检测点集合 + */ + public List selectCfElectricCheckpointList(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 新增能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + public int insertCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 修改能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + public int updateCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint); + + /** + * 批量删除能效检测点 + * + * @param ids 需要删除的能效检测点ID + * @return 结果 + */ + public int deleteCfElectricCheckpointByIds(Long[] ids); + + /** + * 删除能效检测点信息 + * + * @param id 能效检测点ID + * @return 结果 + */ + public int deleteCfElectricCheckpointById(Long id); +} diff --git a/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/impl/CfElectricCheckpointServiceImpl.java b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/impl/CfElectricCheckpointServiceImpl.java new file mode 100644 index 0000000..66d3726 --- /dev/null +++ b/neu-carbon-footprint/src/main/java/com/neu/carbon/footprint/service/impl/CfElectricCheckpointServiceImpl.java @@ -0,0 +1,95 @@ +package com.neu.carbon.footprint.service.impl; + +import java.util.List; +import com.neu.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.neu.carbon.footprint.mapper.CfElectricCheckpointMapper; +import com.neu.carbon.footprint.domain.CfElectricCheckpoint; +import com.neu.carbon.footprint.service.ICfElectricCheckpointService; + +/** + * 能效检测点Service业务层处理 + * + * @author neuedu + * @date 2024-11-16 + */ +@Service +public class CfElectricCheckpointServiceImpl implements ICfElectricCheckpointService +{ + @Autowired + private CfElectricCheckpointMapper cfElectricCheckpointMapper; + + /** + * 查询能效检测点 + * + * @param id 能效检测点ID + * @return 能效检测点 + */ + @Override + public CfElectricCheckpoint selectCfElectricCheckpointById(Long id) + { + return cfElectricCheckpointMapper.selectCfElectricCheckpointById(id); + } + + /** + * 查询能效检测点列表 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 能效检测点 + */ + @Override + public List selectCfElectricCheckpointList(CfElectricCheckpoint cfElectricCheckpoint) + { + return cfElectricCheckpointMapper.selectCfElectricCheckpointList(cfElectricCheckpoint); + } + + /** + * 新增能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + @Override + public int insertCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint) + { + cfElectricCheckpoint.setCreateTime(DateUtils.getNowDate()); + return cfElectricCheckpointMapper.insertCfElectricCheckpoint(cfElectricCheckpoint); + } + + /** + * 修改能效检测点 + * + * @param cfElectricCheckpoint 能效检测点 + * @return 结果 + */ + @Override + public int updateCfElectricCheckpoint(CfElectricCheckpoint cfElectricCheckpoint) + { + return cfElectricCheckpointMapper.updateCfElectricCheckpoint(cfElectricCheckpoint); + } + + /** + * 批量删除能效检测点 + * + * @param ids 需要删除的能效检测点ID + * @return 结果 + */ + @Override + public int deleteCfElectricCheckpointByIds(Long[] ids) + { + return cfElectricCheckpointMapper.deleteCfElectricCheckpointByIds(ids); + } + + /** + * 删除能效检测点信息 + * + * @param id 能效检测点ID + * @return 结果 + */ + @Override + public int deleteCfElectricCheckpointById(Long id) + { + return cfElectricCheckpointMapper.deleteCfElectricCheckpointById(id); + } +} diff --git a/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/domain/CfElectricCheckpoint.class b/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/domain/CfElectricCheckpoint.class new file mode 100644 index 0000000000000000000000000000000000000000..65a127c0f22fbaafd398cee8259fc8bd2eb17711 GIT binary patch literal 2940 zcmb7F>vI!T6hAj@nr&F1mX{!E@qulTZh=zNBG5-F#k4?MA}=l5KfnD+ zL_IVcr#6~wrswG#4=Enr;o&?F7kIcBqf5>Wcp&p(y3ia|V6}rlER-qZ54TY}pe4U--Vw8`ODX7JfwxQ=z(sm5XJU22VNSqS1 zanLdyS2x|1o-4{ISo2Q^iWnJeN?y}%>RL`Wvs%(Jvwebgju%bW$jg-B7}Gh~Z<>~? zyKw0U>PQ-v=G@Y=S!ru}RipJ6j8Q8ib7yR;AZ>RRexf(|KtWCAKfWk^vM6XzGHvBG zQx-MMdCRPEpe1gnWe%GfO+Al2tu?eJT-)%7spTKPDu3{6>C=zP-_Hq(>6wfz9k8k> z9?q4%z5|8rp0RF88;a6T-zNzVm)t_wvIZ9{+Xs@zPS;fzsk5AHwdaVH)l+K@II4DbO9nr3GzH8m1g8=BK4S zsUv250V|DM=*S4pk0H4eHxjW}GjEVqD5x?0A{>xQWfUQOg=8uv~Q&dBuj zf(0E%)RFE8lD4J2COlr&m`gP4Yg^kp>eYw|wvKtB-B!Cfh%IlAVY_d!^*;_)!XJl= z{z}N>u&xTwj8|gLniWCyG}WMcx)re*+KC|U%}`aa;#&Txg5nca(N4=@gM+#=EG}JK zz+7DaQ<;e0=Eol{Er0&e@^^QZ=kKGERC-pO1J2?N~d|bXQi3eQAC1XUfJgNVA`@} zrR)ZDM<&qw?yR7$C%*QCJIl#w89kSr9GOavj3uTfCNCrt2wif0PLQHRZFQcWzJ@O7 zTdx{@PN1BC63W9;1@{Hi;yDp68@-2$nB7~Lh1nSbZ8&F3b3C+gv)icg;uf9 zV1Zg*ZE>JtaR3%5^wk!JDi()efi75Wakye}7#3)e)fPu87Ds3kv}iJnZ{Ri>W`Q}{ zxk%z?@49^$o4mzVItr}%2J|K!gCyuUoxsSOkKwooTX*i8r$}{o+*|FXC>`-UZ1=4K z5A59!r{Go$d{v43LXkN*jZl?HUnr458VV!QP*3DIh@4o1h@Ul7ISq#pX{aYM6iVc+ za3YQML{5Up$Qnfa;t>2Ag%D}1Co&pJWF$N_(Rw0hL1cUlB7O}Dei1{6MC*y9LW#T` zPNb=x$VCvjv<4Bs)CIrFAw-($iA;qO84XWOte!|3L^5j-@jFWJmm!2mte(hBC=q-i zg3Sxm2t;({cTz5NKBDGDinng)Tp)FUHnwg8*vy~>;3)>J09zPr1=z-5JHQSGPXp{^ zunXWB2D<^C1z4cxs=N-Ohl%oNeUo;Og-5P{C+r5E8yijLAVe;W;!~Hx=j}2+Xj8DQ acK(&1ZzFWZYs<6VGq?eF7{?#a;KaXUr(=Bp literal 0 HcmV?d00001 diff --git a/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.class b/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/mapper/CfElectricCheckpointMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..6327ae1fb6b87f74aff40d130cab1f8d24c85825 GIT binary patch literal 810 zcmbV~zfQw25XL{3($Mmsc4DAwyWoWdiWsOsR0?9~$mAw&a7paQagf+}E(RWeheBLZ zBqSO-WIFkL_q$Jb-{;r+2Y@s5JREuGGMr>GmVq13Z;D`5Fn*H3b83`!*RPY1;cnnB z#Eamu&=L2Ijz&X2FbUT(=Yg;@qxswzms;xJp-F_&yoxqjJIhy@D`(Y050?^ir(#}^ zXjXfwA}w5QCBxgGp5njQ%X*kAl5?zdCT-=K8P4nKn-DlpL*ZoA#%bXp9k=>(dED;m zaf#Vq-vPvH<2@D6nu6&p+ v$h$2Dh6cGCXf+u&&;%%MqD6U+vJGs}yNynn-~Nd^*e&0C*ryuemX(L!>2m|S literal 0 HcmV?d00001 diff --git a/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/service/ICfElectricCheckpointService.class b/neu-carbon-footprint/target/classes/com/neu/carbon/footprint/service/ICfElectricCheckpointService.class new file mode 100644 index 0000000000000000000000000000000000000000..62bd2fcc3bd4059132bdc0a6277395482d908ee2 GIT binary patch literal 815 zcmbV~zfQw25XL{3($Mmsc48=EYZtt*paKIGh)R(dIx@MA8(dPma-2$RJQo8Gz(XM} z0SSqQ4w+6q-~H~>-S_eN_7312od8Dx+6>)PB})3?^fnJp%i)uf&kL)Kzj+x&4EMco zCYFLH!o)nZCLZ)dY3JOij7#Ar*6^vde&MKtM|Li>;bpYJ+F7AaeKD&Ny8kUP^E%-< ziDos&IyS;*PBFapsww`9y{v}0COOC2q{@}9ncQF)0L4u-C?8O^hAnzG(JJ!WKXC`U#d{C?R72dN^6(3mcmuAtJTp@M>_wbegEOVcL1*9UI8BDEQn#fuVh{MQ6jhfz?yhh`hy8_tz*rOj#Y!$nN=NW%h;#Nl`Vnks%a>JgEbwg z2c594;wL^=6DZY8;J3E?Si64z5uX~!^)Xm7ZotPQ>y}UQdXqXdpJ88E!xxINEQ2?pw6jaIJ+6~{TG@S^XZcs$&gHA*g>|FWTXx=NNPH8uIcx;TCn2Z!SGOkMk3!A1B2kM@7 z6?85w+9CO0cET1Yr`B>}RjiENZ7bQIvf`nHBOVUmU>>(ToWQ(?lQ@;fZ4Ya>lSkFV zU95Zf7Uw*icjf{vdRV}szFnXvy|v8Auia|Ydx z(K;9%a2#K< list = mesFactoryModelService.selectMesFactoryModelList(mesFactoryModel); + list.forEach(materia -> { + WmsMaterialInfo wmsMaterialInfo = wmsMaterialInfoService.selectWmsMaterialInfoById(materia.getMaterialId()); + if (wmsMaterialInfo != null) { + materia.setMaterialName(wmsMaterialInfo.getName()); + } + }); + return getDataTable(list); + } + + /** + * 导出工厂建模列表 + */ + @ApiOperation("导出工厂建模列表") + @DynamicResponseParameters(properties = { + @DynamicParameter(name = "code", value = "状态码，200正确，其他错误"), + @DynamicParameter(name = "msg", value = "文件名") + }) + @PreAuthorize("@ss.hasPermi('mes:model:export')") + @Log(title = "工厂建模", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(MesFactoryModel mesFactoryModel) { + List list = mesFactoryModelService.selectMesFactoryModelList(mesFactoryModel); + ExcelUtil util = new ExcelUtil(MesFactoryModel.class); + return util.exportExcel(list, "model"); + } + + /** + * 获取工厂建模详细信息 + */ + @ApiOperation("获取工厂建模详细信息") + @DynamicResponseParameters(properties = { + @DynamicParameter(name = "code", value = "状态码，200正确，其他错误"), + @DynamicParameter(name = "data", value = "返回业务数据", dataTypeClass = MesFactoryModel.class), + @DynamicParameter(name = "msg", value = "返回消息内容") + }) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + MesFactoryModel mesFactoryModel = mesFactoryModelService.selectMesFactoryModelById(id); + WmsMaterialInfo wmsMaterialInfo = wmsMaterialInfoService.selectWmsMaterialInfoById(mesFactoryModel.getMaterialId()); + mesFactoryModel.setMesFactoryModelDetailList(wmsMaterialInfo); + return AjaxResult.success(mesFactoryModel); + + + } + + /** + * 新增工厂建模 + */ + @ApiOperation("新增工厂建模") + @DynamicResponseParameters(properties = { + @DynamicParameter(name = "code", value = "状态码，200正确，其他错误"), + @DynamicParameter(name = "msg", value = "返回消息内容") + }) + @PreAuthorize("@ss.hasPermi('mes:model:add')") + @Log(title = "工厂建模", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesFactoryModel mesFactoryModel) { + return toAjax(mesFactoryModelService.insertMesFactoryModel(mesFactoryModel)); + } + + /** + * 修改工厂建模 + */ + @ApiOperation("修改工厂建模") + @DynamicResponseParameters(properties = { + @DynamicParameter(name = "code", value = "状态码，200正确，其他错误"), + @DynamicParameter(name = "msg", value = "返回消息内容") + }) + @PreAuthorize("@ss.hasPermi('mes:model:edit')") + @Log(title = "工厂建模", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesFactoryModel mesFactoryModel) { + return toAjax(mesFactoryModelService.updateMesFactoryModel(mesFactoryModel)); + } + + /** + * 删除工厂建模 + */ + @ApiOperation("删除工厂建模") + @DynamicResponseParameters(properties = { + @DynamicParameter(name = "code", value = "状态码，200正确，其他错误"), + @DynamicParameter(name = "msg", value = "返回消息内容") + }) + @PreAuthorize("@ss.hasPermi('mes:model:remove')") + @Log(title = "工厂建模", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(mesFactoryModelService.deleteMesFactoryModelByIds(ids)); + } +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesFactoryModel.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesFactoryModel.java new file mode 100644 index 0000000..8968ce5 --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesFactoryModel.java @@ -0,0 +1,100 @@ +package com.neu.carbon.mes.domain; + +import com.neu.carbon.wms.domain.WmsMaterialInfo; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.neu.common.annotation.Excel; +import com.neu.common.core.domain.BaseEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.List; + +/** + * 工厂建模对象 mes_factory_model + * + * @author neuedu + * @date 2024-11-16 + */ +@ApiModel("工厂建模") +public class MesFactoryModel extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + @ApiModelProperty("编号") + private Long id; + + /** + * 物料档案编号 + */ + @ApiModelProperty("物料档案编号") + @Excel(name = "物料档案编号") + private Long materialId; + + /** + * 生产线名称 + */ + @ApiModelProperty("生产线名称") + @Excel(name = "生产线名称") + private String productLineName; + + public WmsMaterialInfo mesFactoryModelDetailList; + + private String materialName; + + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + + public void setId(Long id) { + this.id = id; + } + + + public WmsMaterialInfo getMesFactoryModelDetailList() { + return mesFactoryModelDetailList; + } + + public void setMesFactoryModelDetailList(WmsMaterialInfo mesFactoryModelDetailList) { + this.mesFactoryModelDetailList = mesFactoryModelDetailList; + } + + public Long getId() { + return id; + } + + public void setMaterialId(Long materialId) { + this.materialId = materialId; + } + + public Long getMaterialId() { + return materialId; + } + + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; + } + + public String getProductLineName() { + return productLineName; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("materialId", getMaterialId()) + .append("productLineName", getProductLineName()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesProject.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesProject.java new file mode 100644 index 0000000..d6bae67 --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/domain/MesProject.java @@ -0,0 +1,136 @@ +package com.neu.carbon.mes.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.neu.common.annotation.Excel; +import com.neu.common.core.domain.BaseEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 项目维护对象 mes_project + * + * @author neuedu + * @date 2024-11-16 + */ +@ApiModel("项目维护") +public class MesProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + @ApiModelProperty("编号") + private Long id; + + /** 项目名 */ + @ApiModelProperty("项目名") + @Excel(name = "项目名") + private String name; + + /** 负责人 */ + @ApiModelProperty("负责人") + @Excel(name = "负责人") + private String leader; + + /** 开始日期 */ + @ApiModelProperty(value="开始日期",example = "2021-09-10") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date startDate; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期",example = "2021-09-10") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + /** 项目介绍 */ + @ApiModelProperty("项目介绍") + @Excel(name = "项目介绍") + private String description; + + /** 项目状态 */ + @ApiModelProperty("项目状态") + @Excel(name = "项目状态") + private String status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setLeader(String leader) + { + this.leader = leader; + } + + public String getLeader() + { + return leader; + } + public void setStartDate(Date startDate) + { + this.startDate = startDate; + } + + public Date getStartDate() + { + return startDate; + } + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + public Date getEndDate() + { + return endDate; + } + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("leader", getLeader()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("description", getDescription()) + .append("status", getStatus()) + .toString(); + } +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesFactoryModelMapper.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesFactoryModelMapper.java new file mode 100644 index 0000000..a98fcfb --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesFactoryModelMapper.java @@ -0,0 +1,83 @@ +package com.neu.carbon.mes.mapper; + +import java.util.List; +import com.neu.carbon.mes.domain.MesFactoryModel; +import com.neu.carbon.mes.domain.MesFactoryModelDetail; + +/** + * 工厂建模Mapper接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface MesFactoryModelMapper +{ + /** + * 查询工厂建模 + * + * @param id 工厂建模ID + * @return 工厂建模 + */ + public MesFactoryModel selectMesFactoryModelById(Long id); + + /** + * 查询工厂建模列表 + * + * @param mesFactoryModel 工厂建模 + * @return 工厂建模集合 + */ + public List selectMesFactoryModelList(MesFactoryModel mesFactoryModel); + + /** + * 新增工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + public int insertMesFactoryModel(MesFactoryModel mesFactoryModel); + + /** + * 修改工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + public int updateMesFactoryModel(MesFactoryModel mesFactoryModel); + + /** + * 删除工厂建模 + * + * @param id 工厂建模ID + * @return 结果 + */ + public int deleteMesFactoryModelById(Long id); + + /** + * 批量删除工厂建模 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteMesFactoryModelByIds(Long[] ids); + + /** + * 批量新增工厂建模明细 + * @param mesFactoryModelDetailList list + * @return 结果 + */ + public int batchMesFactoryModelDetail(List mesFactoryModelDetailList); + + /** + * 批量删除工厂建模明细 + * @param ids id + * @return 结果 + */ + public int deleteMesFactoryModelDetailByProductLineIds(Long[] ids); + + /** + * 通过id删除工厂建模明细 + * @param ids id + * @return 结果 + */ + public int deleteMesFactoryModelDetailByProductLineId(Long id); +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesProjectMapper.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesProjectMapper.java new file mode 100644 index 0000000..8abaf3d --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/mapper/MesProjectMapper.java @@ -0,0 +1,61 @@ +package com.neu.carbon.mes.mapper; + +import java.util.List; +import com.neu.carbon.mes.domain.MesProject; + +/** + * 项目维护Mapper接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface MesProjectMapper +{ + /** + * 查询项目维护 + * + * @param id 项目维护ID + * @return 项目维护 + */ + public MesProject selectMesProjectById(Long id); + + /** + * 查询项目维护列表 + * + * @param mesProject 项目维护 + * @return 项目维护集合 + */ + public List selectMesProjectList(MesProject mesProject); + + /** + * 新增项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + public int insertMesProject(MesProject mesProject); + + /** + * 修改项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + public int updateMesProject(MesProject mesProject); + + /** + * 删除项目维护 + * + * @param id 项目维护ID + * @return 结果 + */ + public int deleteMesProjectById(Long id); + + /** + * 批量删除项目维护 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteMesProjectByIds(Long[] ids); +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesFactoryModelService.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesFactoryModelService.java new file mode 100644 index 0000000..4fbc129 --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesFactoryModelService.java @@ -0,0 +1,61 @@ +package com.neu.carbon.mes.service; + +import java.util.List; +import com.neu.carbon.mes.domain.MesFactoryModel; + +/** + * 工厂建模Service接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface IMesFactoryModelService +{ + /** + * 查询工厂建模 + * + * @param id 工厂建模ID + * @return 工厂建模 + */ + public MesFactoryModel selectMesFactoryModelById(Long id); + + /** + * 查询工厂建模列表 + * + * @param mesFactoryModel 工厂建模 + * @return 工厂建模集合 + */ + public List selectMesFactoryModelList(MesFactoryModel mesFactoryModel); + + /** + * 新增工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + public int insertMesFactoryModel(MesFactoryModel mesFactoryModel); + + /** + * 修改工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + public int updateMesFactoryModel(MesFactoryModel mesFactoryModel); + + /** + * 批量删除工厂建模 + * + * @param ids 需要删除的工厂建模ID + * @return 结果 + */ + public int deleteMesFactoryModelByIds(Long[] ids); + + /** + * 删除工厂建模信息 + * + * @param id 工厂建模ID + * @return 结果 + */ + public int deleteMesFactoryModelById(Long id); +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesProjectService.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesProjectService.java new file mode 100644 index 0000000..3c1f4ad --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/IMesProjectService.java @@ -0,0 +1,61 @@ +package com.neu.carbon.mes.service; + +import java.util.List; +import com.neu.carbon.mes.domain.MesProject; + +/** + * 项目维护Service接口 + * + * @author neuedu + * @date 2024-11-16 + */ +public interface IMesProjectService +{ + /** + * 查询项目维护 + * + * @param id 项目维护ID + * @return 项目维护 + */ + public MesProject selectMesProjectById(Long id); + + /** + * 查询项目维护列表 + * + * @param mesProject 项目维护 + * @return 项目维护集合 + */ + public List selectMesProjectList(MesProject mesProject); + + /** + * 新增项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + public int insertMesProject(MesProject mesProject); + + /** + * 修改项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + public int updateMesProject(MesProject mesProject); + + /** + * 批量删除项目维护 + * + * @param ids 需要删除的项目维护ID + * @return 结果 + */ + public int deleteMesProjectByIds(Long[] ids); + + /** + * 删除项目维护信息 + * + * @param id 项目维护ID + * @return 结果 + */ + public int deleteMesProjectById(Long id); +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.java new file mode 100644 index 0000000..76835aa --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.java @@ -0,0 +1,103 @@ +package com.neu.carbon.mes.service.impl; + +import java.util.ArrayList; +import java.util.List; + +import com.neu.carbon.mes.domain.MesFactoryModelDetail; +import com.neu.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.neu.carbon.mes.mapper.MesFactoryModelMapper; +import com.neu.carbon.mes.domain.MesFactoryModel; +import com.neu.carbon.mes.service.IMesFactoryModelService; + +import javax.annotation.Resource; + +/** + * 工厂建模Service业务层处理 + * + * @author neuedu + * @date 2024-11-16 + */ +@Service +public class MesFactoryModelServiceImpl implements IMesFactoryModelService +{ + @Autowired + @Resource + private MesFactoryModelMapper mesFactoryModelMapper; + + /** + * 查询工厂建模 + * + * @param id 工厂建模ID + * @return 工厂建模 + */ + @Override + public MesFactoryModel selectMesFactoryModelById(Long id) + { + return mesFactoryModelMapper.selectMesFactoryModelById(id); + } + + /** + * 查询工厂建模列表 + * + * @param mesFactoryModel 工厂建模 + * @return 工厂建模 + */ + @Override + public List selectMesFactoryModelList(MesFactoryModel mesFactoryModel) + { + return mesFactoryModelMapper.selectMesFactoryModelList(mesFactoryModel); + } + + /** + * 新增工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + @Override + public int insertMesFactoryModel(MesFactoryModel mesFactoryModel) + { + return mesFactoryModelMapper.insertMesFactoryModel(mesFactoryModel); + } + + /** + * 修改工厂建模 + * + * @param mesFactoryModel 工厂建模 + * @return 结果 + */ + @Override + public int updateMesFactoryModel(MesFactoryModel mesFactoryModel) + { + return mesFactoryModelMapper.updateMesFactoryModel(mesFactoryModel); + } + + /** + * 批量删除工厂建模 + * + * @param ids 需要删除的工厂建模ID + * @return 结果 + */ + @Override + public int deleteMesFactoryModelByIds(Long[] ids) + { + mesFactoryModelMapper.deleteMesFactoryModelDetailByProductLineIds(ids); + return mesFactoryModelMapper.deleteMesFactoryModelByIds(ids); + } + + /** + * 删除工厂建模信息 + * + * @param id 工厂建模ID + * @return 结果 + */ + @Override + public int deleteMesFactoryModelById(Long id) + { + mesFactoryModelMapper.deleteMesFactoryModelDetailByProductLineId(id); + return mesFactoryModelMapper.deleteMesFactoryModelById(id); + } + +} diff --git a/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesProjectServiceImpl.java b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesProjectServiceImpl.java new file mode 100644 index 0000000..e888de2 --- /dev/null +++ b/neu-carbon-mes/src/main/java/com/neu/carbon/mes/service/impl/MesProjectServiceImpl.java @@ -0,0 +1,93 @@ +package com.neu.carbon.mes.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.neu.carbon.mes.mapper.MesProjectMapper; +import com.neu.carbon.mes.domain.MesProject; +import com.neu.carbon.mes.service.IMesProjectService; + +/** + * 项目维护Service业务层处理 + * + * @author neuedu + * @date 2024-11-16 + */ +@Service +public class MesProjectServiceImpl implements IMesProjectService +{ + @Autowired + private MesProjectMapper mesProjectMapper; + + /** + * 查询项目维护 + * + * @param id 项目维护ID + * @return 项目维护 + */ + @Override + public MesProject selectMesProjectById(Long id) + { + return mesProjectMapper.selectMesProjectById(id); + } + + /** + * 查询项目维护列表 + * + * @param mesProject 项目维护 + * @return 项目维护 + */ + @Override + public List selectMesProjectList(MesProject mesProject) + { + return mesProjectMapper.selectMesProjectList(mesProject); + } + + /** + * 新增项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + @Override + public int insertMesProject(MesProject mesProject) + { + return mesProjectMapper.insertMesProject(mesProject); + } + + /** + * 修改项目维护 + * + * @param mesProject 项目维护 + * @return 结果 + */ + @Override + public int updateMesProject(MesProject mesProject) + { + return mesProjectMapper.updateMesProject(mesProject); + } + + /** + * 批量删除项目维护 + * + * @param ids 需要删除的项目维护ID + * @return 结果 + */ + @Override + public int deleteMesProjectByIds(Long[] ids) + { + return mesProjectMapper.deleteMesProjectByIds(ids); + } + + /** + * 删除项目维护信息 + * + * @param id 项目维护ID + * @return 结果 + */ + @Override + public int deleteMesProjectById(Long id) + { + return mesProjectMapper.deleteMesProjectById(id); + } +} diff --git a/neu-carbon-mes/src/main/resources/mapper/mes/MesFactoryModelMapper.xml b/neu-carbon-mes/src/main/resources/mapper/mes/MesFactoryModelMapper.xml new file mode 100644 index 0000000..c640316 --- /dev/null +++ b/neu-carbon-mes/src/main/resources/mapper/mes/MesFactoryModelMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + select id, material_id, product_line_name, remark from mes_factory_model + + + + + + + + insert into mes_factory_model + + material_id, + product_line_name, + remark, + + + #{materialId}, + #{productLineName}, + #{remark}, + + + + + update mes_factory_model + + material_id = #{materialId}, + product_line_name = #{productLineName}, + remark = #{remark}, + + where id = #{id} + + + + delete from mes_factory_model where id = #{id} + + + + delete from mes_factory_model where id in + + #{id} + + + + + insert into mes_factory_model_detail(product_line_id,equipment_id) values + + (#{item.productLineId},#{item.equipmentId}) + + + + + delete from mes_factory_model_detail where product_line_id in + + #{id} + + + + + delete from mes_factory_model_detail where product_line_id = #{productLineId} + + \ No newline at end of file diff --git a/neu-carbon-mes/target/classes/com/neu/carbon/mes/controller/MesFactoryModelController.class b/neu-carbon-mes/target/classes/com/neu/carbon/mes/controller/MesFactoryModelController.class new file mode 100644 index 0000000000000000000000000000000000000000..8bc60130f77bc66001c909606ffc94141a34354b GIT binary patch literal 6518 zcmbtY`+F4C8GdIIvXBe}Q=r^Mz#2keD5YK!Ktd8VbpwGw)M77_-IHWscW0fMB}7XL z78UW@ideNpL9z5AU~7XAlwNIX?fvo>up$2BKhUR7-!rq>nQUe;X`ejL?3_8@_nr5< ze z+%c_zb~7Q8ox<8{#D#)&vACJi(ju$Hb*tMH@ci{+CD=!2U2vyp0v>;*6ki6vt=Nyr;PY^VP_cGqC=O_%;>avKxM`!Tapde-Qd?#}@hl&?d^Gp+@hk7Vlsj^QVuqh0>0!QH z9XfRNt)blUCqBOPxPs{k#?lV@xH+lYWGhSAy-Ws=d3f;f@WHdWM<2k`!c4* zSl;pf$8tU%n|AB_XxeO2#$CA#LIU@r$_sw^+14_qp|$Rdi{wr&Nxf|XWRnfhxw*5K za*tgMiSl|0)-s#{O^?TgO~97On6{&JSc3Jf&$NsO1#vIg zWZSFzbh|@XDWmo#rf)+^mg5G`x;L#*aDB0AevoT1(@hD-aAeU^gHXBb&f2VNwk;j1 zU|F#ok*?$kXR@&m0S?K63Vrt3!`oxqO1*%0QAaT?pb}2FN1v zkdfH0VCmTIRY=A$ZS3YyM~4-x4&CV+?Hz1>tm`255VXPEira^ig3#RFMkJDbhK05O+~gu&#lxpMi;@X-rnK`$-^TJpH4cXqTi z?P#4$jqk_?Kv!5IW$tCnHq`F=-y^QfNU(%mH%NK-fT-;&Ey0Ez9M6z18dj$)x(L-e{IC?KF89v5^#XpO6v!H+M2MdEAYlle7`!1(=%bI_yK+x z#gA0{7;maL16GBlg(j>#;<|&oCIpc@^*A zf{Ke6isF)rck!Nz%lNs9U*MN2ekI?2jo;9HD&EI$Rs0UWXQYKdn8>WDU{!%LFf|5P zH|w_WoitwA(p6W%G~3ZFr-LJ?g0+Qnd?S6reSy~nn|Tp;iUL!PoC-EfDieyP(8fx9 zfIldh9c)!wyLa=j#uZ)iTJ#~Ss%**`9(8Z%Q2`?r0rc&~&gYNHJ=t_z-gPwY+u4+` zm^3r|ZBMOek7>2)@jeAh^4Q!ldpxhan5gWza<0$cJQ{)=Qe26~8+s|26*PrA*wGRS zs=WU0PEiW(9(O{Z@OC=#>Q>^+ux20b-pvDT?1OZ#YZ`wD2n-Q^2<62VIe>E!=w2k2Jbsou?mxITW!oe$CPuvg1Xwa zfa9;Fg*-l+;TR{1ET~{UXJy%6$68jpj16m6$n-!2a-QAd-mqqk37veDb0n3%%Ky{B zBOFsrMzf(Sia)CO6aJ>+0a$D)epnmnz2+XF#oQLpo}}mh&B3hWeQ|UZ#Xo3|m}&0G zW|;DA>9nxi{FFDy4}r691-O8U2ZJuz=~4_V>~${#|JsKZJgR!xpt z)bpTKab=P6dRw#TKR6{bNq)Q?+Lq5z6m#z^cEYp%I~)omJM>* zD3@h&cfDM0z{WUM7D#TF-!@TB6G3_!KTc|?z@mV*LzsGB&9w8V+_I{^rfLwXuk8$1 zt8J*lcFabnt7)AlprGlZyrxwJO=t7}n$2h-uhe-CkM{PY&fZ=t_oVjs(9C&_?->$ZDLN0T?+)p~G^Rm3o)9GQp&Y)wf zFJNW_Tk2O0;=1~GP$M;u1pKTMc{d|8&S*>ov|m=xei^N@gU3~2u4{(~sVlJ)U3m>9 zh`fgPjA~dGqM_@=d!@tf3w5F&BVWWWqEuzr-|v~ClRsagi#>Il`5PfcbzNTHPem|@ zS-xssZe(3`q;p7GP^UWYOzE7hzH`1j3Oy16-FMEWQRjT6$T?qSoWsQ(mAJdPP-xVW zkY|TNJ~SD~iAh2hMUZ>YJ05Z$j8ayf6AJmc5|DRe4=qrX0?A22P8C5;!=zBJl4N{q z-wzq&>}uSURnMl+Wz}0ClVIg&613O9kE)f-iBAt=t}LX%dba^Hu#x$FJ8N~5tCCmm z78C+!0maICHv`k%=#Rjm4A$y@V}2A_Cg5JKBj|UPUQFrxNIl?Iy%-+k-a`fKU&CLy auH^d9_&ff>jCz=BSv$W;zC(BfkNy{$&xZj3 literal 0 HcmV?d00001 diff --git a/neu-carbon-mes/target/classes/com/neu/carbon/mes/domain/MesFactoryModel.class b/neu-carbon-mes/target/classes/com/neu/carbon/mes/domain/MesFactoryModel.class new file mode 100644 index 0000000000000000000000000000000000000000..ea712211270c33bb482f28d99556d7b033f8c1bf GIT binary patch literal 2633 zcmb7`+fy4=9LK*WkPGQjkV0!MR;khwuxxE=y@0h`f~9UKLZF}`JqgEjYj!uYyJ_Xs zCw=hp;B>|(hjE(g(1{zenUu{<*}NwkEsksprf@5XIHnUglcdG>zfURq`_Seagq#o?0osl_QUVD*M8hy`=Tb%qZKSeHAO|G-muI% z6KdwOf+&&NW|JGFwXJMhE0uz)>86pXw&7%J{N^VXktntMRPD!x zbyIh*F*Nn1=81ER{6U-^V8zG_JIBeLbaTxrP?$Ici{}1fvwK%3{~iD!*cw1~KQ{ri z6@^=4sxox;r9!>n1O>bL4$4XDC`rojoT%UT5<~8GON09{>fLvdtnUW!5Dx5?SdG;U z_8mc+2TyojZte4epVqB)K9EAKb za98+s;&=s|R`V6Tv_h4c^8rVz^Ef_G@F6~uikB1&<81{WV_CsFax{W86{#%@Zhxxa z4$=xnAXQ5u9|Jc+Oly4$+cpHACh_!`M zZpI4+g}jq~Fn}1I!%3V1!?QGt;52>J?g{jHLD=%~a|c_0j$fuwOl~L26^(Vi#>!50C&Z z;Z>S3Tt=GO{fD0*@;Gq#a_HeJc+Ee2jo2g7RR6&5i0qk8daGB-;Om}-lT|6-yhM}t zkknU6q6)H4S5r{e5a}9jpsVV5hBxr0uWQdEPtY8^)b-Fyy@jDLkmexBIDupufXE=p zOHnz8fHVa`ZiIqd3-?Gg2%-^4wgE^r)~OJ1wnEIGS>j4n%GRf zXdxi6Ajm=}2)%v&;R>2*1f-uLzS#d85*ujgNcOMe*gBMsRvH|agEktp%fT}==%B$m xPVAXFOMlUTB^;+0_Y{_?MDI}CIGN59)mpp%mH_ifMWDAw>l@$&zl_?8e;DO`>r3O$0|F`6v!z=$Bu12cjo_r(Zg z?%$4}n|mvQ!`#~u9O2$!qf!`G!ni8XY^#>0=;NwoYo;+a*e@VX3T*5%4ck!+XI#-s zYLHO*CjEYwaI}ItuGv~fSC1No=_n4lv<2d6&6Mq{ zN<%nZxFMZRw$c5mhW!mZ^6x|k51&nZzDy!qvu^Gnxn z(EK6I(3~EDhPL=P-E$vBLSR!`Gt}WyA){KO3I&pH-po>hD3m5N_9h#hNsV0Yt6sWd zW$3&G)s}N+LD39(NVO@hQ)-sa8?;qtkPf)HttO7;)Zx8@d3Uv?EndG&rzX?kat>^% zHTIH#&BJ8wYP7C$P|Xu^k*Db(3Gd;33Bx!g;S4vU7?bcCHxoR3otrmsN?^}Q1^-7f z3G7`_a|=CdT52Wfjw!a9qKC+t5omvC_7P`>Z?<`8EIm4SF+Dh(x;QdAkxtS1(~sta zZaP()rKd9G0(ev}oOdCmSfqj%I9Kb?%judj@wSLR{2pGYy0MEs2RrGhiC_nw!qX6V zhDHIJ4{&nOcrT4NP`{7<&)R6C1xgrip_NA7!hRf}$+(UEG)LLAR-?V5(M}qaYM#ac zG?0$~JMTo7jf3<}6nNgo3#8w`9y{@3KVHHsJQd*lTx)sA-}2BZOG@gsR6P}{9`a2Y zzgDBSqS1?HTBX9FwvVnwre07VOx%I^wR~^=)P~BFtw@n9xe6G-aT*Dnz#z43%-aQ6 zJF)+F1gh4t@@x-+1j8P-x>}wG_U^_-aAkSEsvvU+{6a0++ckPds#L;!D=Ux5oN&-X>5r5E$0@C!f_dhxc(ffy2!C7N*bRJsk8?6zdLYria+qyT%9Ga7-~<}izY*eg8Q5wnc<_&wt zf0_GXvbfF&nMb0KZ6*{+L?L%uO~|wTkcq$O16vaDUiW4~@aZNi zO(>sKLg_48*R{xVX>O`1GF>37rpq>2lwps~?fnh{@12|)b1B?Nxhj6Ix cQg?(Sx=%2z`^SIv1gG`=4CjO)-5PoM3yE&P<^TWy literal 0 HcmV?d00001 diff --git a/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesFactoryModelService.class b/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesFactoryModelService.class new file mode 100644 index 0000000000000000000000000000000000000000..0f4ab102c578a90921cab2c9a510f6cba8ca4a1f GIT binary patch literal 714 zcmb7?%}T>S6ot>!+SvMU>!RWVw3`lyyQ&Kpg+PjnEL}~LOPG?(NPY@^H5YvVA4
fsCtQh#VNCR5vm<_yjYg_n~ZgfDiGJb)(Kaye($_d$`6u9_3otM>`Ppl^((BbO? ndR>77bOC-3(c`|u-42ep?qg8(kAL11oL2Q2&UuEp)#T+D2)o=& literal 0 HcmV?d00001 diff --git a/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesProjectService.class b/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/IMesProjectService.class new file mode 100644 index 0000000000000000000000000000000000000000..6608afa61c6c924b96b8eedcddf73d774eba6d28 GIT binary patch literal 649 zcma)4%T9zq5Ug2OaM!ns@fYBrbMauZ#)AhF5{xDsy*LXKG8-7o3~b`BdGG`LC}V>r zY=i@+p6*mtPgnQX_s1uIYj`fsTr3zoD|4AtkJ3Jya!s%M_b_F+@uRia2%Za_@u<|< zGKiA0;9Ax^5oT3tUP#N+vJgu1j=daEjFhcf#ZdymZ{xaBId7PxIEz)LMO7Qg@am8I z$A6jIakM*XccQeFX3G+WU~Jcr==EDFD%p9$aGsLM+oi^2OIGPT{e44UB@IHyA=+^(VYVN{eV3^SH0M3+Q2UCFJ fE*z@6RGnat@)_oBeg7{W;IPe)a7-A|ZIP!x>r2AH literal 0 HcmV?d00001 diff --git a/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.class b/neu-carbon-mes/target/classes/com/neu/carbon/mes/service/impl/MesFactoryModelServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..a801d6d14fe16613df165bb43eaa34cfedccc1f6 GIT binary patch literal 2180 zcmb7_+j0{}5QhI*AB5#~39?Mu4)fB zey3a{RTLDt$OGh|Qu$}KB~+^wg)h`IvpxNF&vf_b-~ayp2f!^<^O(W+Q?PMs8b9Di zBYraCb{=ut5=x?bpn+H(Ve+cnQ`$)M|NxAoF@ zI_k*tU(333+(5qU`Ik=LKyF2$ccgvQB=%zM(0SwhKB#`K0x$9#irUF_?dot-V60R= z5Ey^JQwYq~w5#@_PF?xGIE+PLuI4qI_JQMTvrayahp#k)ThBUdp!_$wp``9~+vy|k z_jFaN%((;AR*f)qE!)S{rocuij$XDMwT|_3k3cE2|AJ8Y$_tOXN+u?2HqK$*#wRv-oLW>g+?@;RNvIybTQTIEUokS!&!`Uze& z`_uw5!{}3Qmq0ngBD>H8CR!>qtvy#t>h)u93oK_Q@}UYH-QGTa>U+(o5t_%z5GtR) zIlyH;^D_|mf;&7W%N~?980=J993(fB*gd17HcSGRR;djWiaA!12V2r&c_(;<*(| zRxGFRB88O{RvEIM4Bq?ZP*%ci(P&7YVZKx`9@jGB72%hS=48UX<{{tiuwG-B`Vi?* zd2&w$s$7?wTANUW%IJV$wPgGn4;sGGwF6&x^4R!acv%V^@B>i^jeo+$nFHU9LUXKq zStab?y3#7#VCc)`_Za%OOjR-rmz0+8BCjm{kAk8xjFwDA)c1t1?D}-GKm4pH{7OTUV#wziA3OVP&zS+^xQOZUx5u}b;mN{8Y|@Vd}7UNXA2mQM;%HJ(tq z4NgQyk$<++Jt0y_1z|H%LKouTe2W-`s?Mz^MarDFlwr2l`=xhPO^Yz{sivQDy?J#8 zU+>LrgD#m>ni|noV1|6JQH$grHL4<%=lx-rs8Y+?w`|L32*z{!omI~hp-6|vc4QcGiQhsHN?)4rq#^mK%bJTUMqIeKn!-yL z*KxzeP26&E5BFU>u;L*exyT{Uu$(X@RM<-F^)oD7fGWl^V<;rpclk}w z)zkEEVi=;wv8j>1MnA1V(!-=vq$z8XqqO3r8R>z-Pq6Rw;$V!VH3k`tlXP1Kn7|~h zn5_~?>-?Im9nwREA8_V=q0hlLTDBu*nuy7k*(rh?FokJ?Fk5XpOM>;sVRKzzw{eG1 zGtJO<>5aNaG6_21;A_VXS1yDyI|W@}gK^l_B`}(%F0fP_w$lYRi^l|^F-N`&>`ENA T-v!ocgo8q}EOTe0G7tO*nk1WY literal 0 HcmV?d00001 diff --git a/neu-carbon-mes/target/classes/mapper/mes/MesFactoryModelMapper.xml b/neu-carbon-mes/target/classes/mapper/mes/MesFactoryModelMapper.xml new file mode 100644 index 0000000..c640316 --- /dev/null +++ b/neu-carbon-mes/target/classes/mapper/mes/MesFactoryModelMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + select id, material_id, product_line_name, remark from mes_factory_model + + + + + + + + insert into mes_factory_model + + material_id, + product_line_name, + remark, + + + #{materialId}, + #{productLineName}, + #{remark}, + + + + + update mes_factory_model + + material_id = #{materialId}, + product_line_name = #{productLineName}, + remark = #{remark}, + + where id = #{id} + + + + delete from mes_factory_model where id = #{id} + + + + delete from mes_factory_model where id in + + #{id} + + + + + insert into mes_factory_model_detail(product_line_id,equipment_id) values + + (#{item.productLineId},#{item.equipmentId}) + + + + + delete from mes_factory_model_detail where product_line_id in + + #{id} + + + + + delete from mes_factory_model_detail where product_line_id = #{productLineId} + + \ No newline at end of file diff --git a/neu-common/target/classes/com/neu/common/utils/http/HttpUtils$1.class b/neu-common/target/classes/com/neu/common/utils/http/HttpUtils$1.class new file mode 100644 index 0000000000000000000000000000000000000000..c2242dd93e62d116b17112768cf9beddb0112cee GIT binary patch literal 227 zcma)$O$x$54255`I<<=S2!gtG5WImXx)2xQ0csuk!*oVEQxE6D19&Jg-MBU(?-9uN z$ounr0a#-wAOr@4=xm!hRl7nf!g%lf{o)JlmSyrt2$QWzwRMHbj>_luCJ+%8sjZ|@ zjbyK^kxdK8oKgAX=PSbKV2r9aI&n@pLfl45otR9XuBA#nVfIH-JO!b{Pq)?O25$j+ Q>;d|$Ay33N#Ev-p0w{tyf&c&j literal 0 HcmV?d00001