Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| add7252c05 | |||
| 091f307764 | |||
| 2092cf7f42 | |||
| 26d36b7198 | |||
| 33bea02c92 | |||
| 143adbc822 | |||
| b0ac0030b2 |
8
.idea/.gitignore
generated
vendored
Normal file
8
.idea/.gitignore
generated
vendored
Normal file
@ -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
|
||||
28
.idea/compiler.xml
generated
Normal file
28
.idea/compiler.xml
generated
Normal file
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile default="true" name="Default" enabled="true" />
|
||||
<profile name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="neu-carbon-bid" />
|
||||
<module name="neu-carbon-scm" />
|
||||
<module name="neu-carbon-wms" />
|
||||
<module name="neu-admin" />
|
||||
<module name="neu-carbon-mes" />
|
||||
<module name="neu-generator" />
|
||||
<module name="neu-quartz" />
|
||||
<module name="neu-carbon-footprint" />
|
||||
<module name="neu-common-biz" />
|
||||
<module name="neu-framework" />
|
||||
<module name="neu-system" />
|
||||
<module name="neu-carbon-report" />
|
||||
<module name="neu-common" />
|
||||
<module name="neu-carbon-mapper" />
|
||||
<module name="neu-carbon-service" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
</component>
|
||||
</project>
|
||||
12
.idea/dataSources.xml
generated
Normal file
12
.idea/dataSources.xml
generated
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||
<data-source source="LOCAL" name="carbon@localhost" uuid="a584d99b-5513-4f63-b629-399a6af8f85b">
|
||||
<driver-ref>mysql.8</driver-ref>
|
||||
<synchronize>true</synchronize>
|
||||
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
|
||||
<jdbc-url>jdbc:mysql://localhost:3306/carbon</jdbc-url>
|
||||
<working-dir>$ProjectFileDir$</working-dir>
|
||||
</data-source>
|
||||
</component>
|
||||
</project>
|
||||
37
.idea/encodings.xml
generated
Normal file
37
.idea/encodings.xml
generated
Normal file
@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/neu-admin/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-admin/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-bid/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-bid/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-footprint/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-footprint/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-mapper/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-mapper/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-mes/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-mes/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-report/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-report/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-scm/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-scm/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-service/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-service/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-wms/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-wms/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-common-biz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-common-biz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-common/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-common/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-framework/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-framework/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-generator/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-generator/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-quartz/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-quartz/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-system/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/neu-system/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
25
.idea/jarRepositories.xml
generated
Normal file
25
.idea/jarRepositories.xml
generated
Normal file
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="public" />
|
||||
<option name="name" value="aliyun nexus" />
|
||||
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
12
.idea/misc.xml
generated
Normal file
12
.idea/misc.xml
generated
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
||||
</project>
|
||||
7
.idea/sqldialects.xml
generated
Normal file
7
.idea/sqldialects.xml
generated
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="SqlDialectMappings">
|
||||
<file url="file://$PROJECT_DIR$/neu-carbon-mes/src/main/resources/mapper/mes/MesFactoryModelMapper.xml" dialect="GenericSQL" />
|
||||
<file url="PROJECT" dialect="MySQL" />
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"java.compile.nullAnalysis.mode": "automatic"
|
||||
}
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -28,11 +28,11 @@ import com.neu.common.core.page.TableDataInfo;
|
||||
* 能效检测点Controller
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2022-07-22
|
||||
* @date 2024-11-16
|
||||
*/
|
||||
@Api(tags = {"能效检测点"})
|
||||
@RestController
|
||||
@RequestMapping("/cfElectric/checkpoint")
|
||||
@RequestMapping("/footprint/checkpoint")
|
||||
public class CfElectricCheckpointController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
@ -64,7 +64,7 @@ public class CfElectricCheckpointController extends BaseController
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "文件名")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('cfElectric:checkpoint:export')")
|
||||
@PreAuthorize("@ss.hasPermi('footprint:checkpoint:export')")
|
||||
@Log(title = "能效检测点", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/export")
|
||||
public AjaxResult export(CfElectricCheckpoint cfElectricCheckpoint)
|
||||
@ -97,7 +97,7 @@ public class CfElectricCheckpointController extends BaseController
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('cfElectric:checkpoint:add')")
|
||||
@PreAuthorize("@ss.hasPermi('footprint:checkpoint:add')")
|
||||
@Log(title = "能效检测点", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody CfElectricCheckpoint cfElectricCheckpoint)
|
||||
@ -113,7 +113,7 @@ public class CfElectricCheckpointController extends BaseController
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('cfElectric:checkpoint:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('footprint:checkpoint:edit')")
|
||||
@Log(title = "能效检测点", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody CfElectricCheckpoint cfElectricCheckpoint)
|
||||
@ -129,7 +129,7 @@ public class CfElectricCheckpointController extends BaseController
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('cfElectric:checkpoint:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('footprint:checkpoint:remove')")
|
||||
@Log(title = "能效检测点", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
@ -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<CfElectricCheckpoint> 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);
|
||||
}
|
||||
@ -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<CfElectricCheckpoint> 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);
|
||||
}
|
||||
@ -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<CfElectricCheckpoint> 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);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
Binary file not shown.
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -0,0 +1,151 @@
|
||||
package com.neu.carbon.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.neu.carbon.mes.domain.MesEquipment;
|
||||
import com.neu.carbon.mes.service.IMesEquipmentService;
|
||||
import com.neu.carbon.wms.domain.WmsMaterialInfo;
|
||||
import com.neu.carbon.wms.service.IWmsMaterialInfoService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.neu.common.annotation.Log;
|
||||
import com.neu.common.core.controller.BaseController;
|
||||
import com.neu.common.core.domain.AjaxResult;
|
||||
import com.neu.common.enums.BusinessType;
|
||||
import com.neu.carbon.mes.domain.MesFactoryModel;
|
||||
import com.neu.carbon.mes.service.IMesFactoryModelService;
|
||||
import com.neu.common.utils.poi.ExcelUtil;
|
||||
import com.neu.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 工厂建模Controller
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-16
|
||||
*/
|
||||
@Api(tags = {"工厂建模"})
|
||||
@RestController
|
||||
@RequestMapping("/mes/model")
|
||||
public class MesFactoryModelController extends BaseController {
|
||||
// mes计划排产
|
||||
@Autowired
|
||||
private IMesFactoryModelService mesFactoryModelService;
|
||||
|
||||
//wms物料信息
|
||||
@Autowired
|
||||
private IWmsMaterialInfoService wmsMaterialInfoService;
|
||||
|
||||
/**
|
||||
* 查询工厂建模列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("查询工厂建模列表")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "total", value = "总记录数"),
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "rows", value = "返回业务数据（数组类型）", dataTypeClass = MesFactoryModel.class),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
public TableDataInfo list(MesFactoryModel mesFactoryModel) {
|
||||
startPage();
|
||||
List<MesFactoryModel> 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<MesFactoryModel> list = mesFactoryModelService.selectMesFactoryModelList(mesFactoryModel);
|
||||
ExcelUtil<MesFactoryModel> util = new ExcelUtil<MesFactoryModel>(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.setMesFactoryModelDetail(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));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,162 @@
|
||||
package com.neu.carbon.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.neu.carbon.wms.domain.WmsMaterialInfo;
|
||||
import com.neu.carbon.wms.service.IWmsMaterialInfoService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.neu.common.annotation.Log;
|
||||
import com.neu.common.core.controller.BaseController;
|
||||
import com.neu.common.core.domain.AjaxResult;
|
||||
import com.neu.common.enums.BusinessType;
|
||||
import com.neu.carbon.mes.domain.MesProcessModel;
|
||||
import com.neu.carbon.mes.service.IMesProcessModelService;
|
||||
import com.neu.common.utils.poi.ExcelUtil;
|
||||
import com.neu.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 工艺建模Controller
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-24
|
||||
*/
|
||||
@Api(tags = {"工艺建模"})
|
||||
@RestController
|
||||
@RequestMapping("/mesModel/processModel")
|
||||
public class MesProcessModelController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IMesProcessModelService mesProcessModelService;
|
||||
|
||||
//wms物料信息
|
||||
@Autowired
|
||||
private IWmsMaterialInfoService wmsMaterialInfoService;
|
||||
|
||||
/**
|
||||
* 查询工艺建模列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("查询工艺建模列表")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "total", value = "总记录数"),
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "rows", value = "返回业务数据（数组类型）", dataTypeClass = MesProcessModel.class),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
public TableDataInfo list(MesProcessModel mesProcessModel)
|
||||
{
|
||||
startPage();
|
||||
List<MesProcessModel> list = mesProcessModelService.selectMesProcessModelList(mesProcessModel);
|
||||
|
||||
list.forEach(materia -> {
|
||||
WmsMaterialInfo wmsMaterialInfo = wmsMaterialInfoService.selectWmsMaterialInfoById(materia.getMaterialId());
|
||||
if (wmsMaterialInfo != null) {
|
||||
materia.setMaterialIName(wmsMaterialInfo.getName());
|
||||
materia.setMaterialModel(wmsMaterialInfo.getModel());
|
||||
}
|
||||
});
|
||||
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工艺建模列表
|
||||
*/
|
||||
@ApiOperation("导出工艺建模列表")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "文件名")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('mesModel:processModel:export')")
|
||||
@Log(title = "工艺建模", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/export")
|
||||
public AjaxResult export(MesProcessModel mesProcessModel)
|
||||
{
|
||||
List<MesProcessModel> list = mesProcessModelService.selectMesProcessModelList(mesProcessModel);
|
||||
ExcelUtil<MesProcessModel> util = new ExcelUtil<MesProcessModel>(MesProcessModel.class);
|
||||
return util.exportExcel(list, "processModel");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工艺建模详细信息
|
||||
*/
|
||||
@ApiOperation("获取工艺建模详细信息")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "data", value = "返回业务数据", dataTypeClass = MesProcessModel.class),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
MesProcessModel materia = mesProcessModelService.selectMesProcessModelById(id);
|
||||
|
||||
WmsMaterialInfo wmsMaterialInfo = wmsMaterialInfoService.selectWmsMaterialInfoById(materia.getMaterialId());
|
||||
if (wmsMaterialInfo != null) {
|
||||
materia.setMaterialIName(wmsMaterialInfo.getName());
|
||||
materia.setMaterialModel(wmsMaterialInfo.getModel());
|
||||
}
|
||||
return AjaxResult.success(materia);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工艺建模
|
||||
*/
|
||||
@ApiOperation("新增工艺建模")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('mesModel:processModel:add')")
|
||||
@Log(title = "工艺建模", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody MesProcessModel mesProcessModel)
|
||||
{
|
||||
return toAjax(mesProcessModelService.insertMesProcessModel(mesProcessModel));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工艺建模
|
||||
*/
|
||||
@ApiOperation("修改工艺建模")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('mesModel:processModel:edit')")
|
||||
@Log(title = "工艺建模", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody MesProcessModel mesProcessModel)
|
||||
{
|
||||
return toAjax(mesProcessModelService.updateMesProcessModel(mesProcessModel));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工艺建模
|
||||
*/
|
||||
@ApiOperation("删除工艺建模")
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('mesModel:processModel:remove')")
|
||||
@Log(title = "工艺建模", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(mesProcessModelService.deleteMesProcessModelByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -1,33 +1,40 @@
|
||||
package com.neu.carbon.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
|
||||
import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
|
||||
import com.neu.carbon.mes.domain.MesProject;
|
||||
import com.neu.carbon.mes.service.IMesProjectService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.neu.common.annotation.Log;
|
||||
import com.neu.common.core.controller.BaseController;
|
||||
import com.neu.common.core.domain.AjaxResult;
|
||||
import com.neu.common.core.page.TableDataInfo;
|
||||
import com.neu.common.enums.BusinessType;
|
||||
import com.neu.carbon.mes.domain.MesProject;
|
||||
import com.neu.carbon.mes.service.IMesProjectService;
|
||||
import com.neu.common.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import com.neu.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 项目维护Controller
|
||||
*
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2022-07-07
|
||||
* @date 2024-11-16
|
||||
*/
|
||||
@Api(tags = {"制造执行MES-项目维护"})
|
||||
@Api(tags = {"项目维护"})
|
||||
@RestController
|
||||
@RequestMapping("/baseInfo/projectInfo")
|
||||
public class MesProjectController extends BaseController {
|
||||
@RequestMapping("/mes/project")
|
||||
public class MesProjectController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IMesProjectService mesProjectService;
|
||||
|
||||
@ -36,13 +43,14 @@ public class MesProjectController extends BaseController {
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("查询项目维护列表")
|
||||
@DynamicResponseParameters(name = "mesPlanProductScheduleMaterialList", properties = {
|
||||
@DynamicParameter(name = "total", value = "总记录数"),
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "total", value = "总记录数"),
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "rows", value = "返回业务数据（数组类型）", dataTypeClass = MesProject.class),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
public TableDataInfo list(MesProject mesProject) {
|
||||
public TableDataInfo list(MesProject mesProject)
|
||||
{
|
||||
startPage();
|
||||
List<MesProject> list = mesProjectService.selectMesProjectList(mesProject);
|
||||
return getDataTable(list);
|
||||
@ -56,26 +64,28 @@ public class MesProjectController extends BaseController {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "文件名")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('baseInfo:projectInfo:export')")
|
||||
@PreAuthorize("@ss.hasPermi('mes:project:export')")
|
||||
@Log(title = "项目维护", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/export")
|
||||
public AjaxResult export(MesProject mesProject) {
|
||||
public AjaxResult export(MesProject mesProject)
|
||||
{
|
||||
List<MesProject> list = mesProjectService.selectMesProjectList(mesProject);
|
||||
ExcelUtil<MesProject> util = new ExcelUtil<MesProject>(MesProject.class);
|
||||
return util.exportExcel(list, "projectInfo");
|
||||
return util.exportExcel(list, "project");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取项目维护详细信息
|
||||
*/
|
||||
@ApiOperation("获取项目维护详细信息")
|
||||
@DynamicResponseParameters(name = "mesPlanProductScheduleMaterialGet", properties = {
|
||||
@DynamicResponseParameters(properties = {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "data", value = "返回业务数据", dataTypeClass = MesProject.class),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return AjaxResult.success(mesProjectService.selectMesProjectById(id));
|
||||
}
|
||||
|
||||
@ -87,10 +97,11 @@ public class MesProjectController extends BaseController {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('baseInfo:projectInfo:add')")
|
||||
@PreAuthorize("@ss.hasPermi('mes:project:add')")
|
||||
@Log(title = "项目维护", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody MesProject mesProject) {
|
||||
public AjaxResult add(@RequestBody MesProject mesProject)
|
||||
{
|
||||
return toAjax(mesProjectService.insertMesProject(mesProject));
|
||||
}
|
||||
|
||||
@ -102,10 +113,11 @@ public class MesProjectController extends BaseController {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('baseInfo:projectInfo:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('mes:project:edit')")
|
||||
@Log(title = "项目维护", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody MesProject mesProject) {
|
||||
public AjaxResult edit(@RequestBody MesProject mesProject)
|
||||
{
|
||||
return toAjax(mesProjectService.updateMesProject(mesProject));
|
||||
}
|
||||
|
||||
@ -117,10 +129,11 @@ public class MesProjectController extends BaseController {
|
||||
@DynamicParameter(name = "code", value = "状态码，200正确，其他错误"),
|
||||
@DynamicParameter(name = "msg", value = "返回消息内容")
|
||||
})
|
||||
@PreAuthorize("@ss.hasPermi('baseInfo:projectInfo:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('mes:project:remove')")
|
||||
@Log(title = "项目维护", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(mesProjectService.deleteMesProjectByIds(ids));
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
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 mesFactoryModelDetail;
|
||||
|
||||
private String materialName;
|
||||
|
||||
|
||||
public String getMaterialName() {
|
||||
return materialName;
|
||||
}
|
||||
|
||||
public void setMaterialName(String materialName) {
|
||||
this.materialName = materialName;
|
||||
}
|
||||
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
|
||||
// 魔改
|
||||
|
||||
/** 工厂建模设备信息子信息 */
|
||||
@ApiModelProperty("工厂建模设备信息")
|
||||
private List<MesFactoryModelDetail> mesFactoryModelDetailList;
|
||||
|
||||
public List<MesFactoryModelDetail> getMesFactoryModelDetailList() {
|
||||
return mesFactoryModelDetailList;
|
||||
}
|
||||
|
||||
public void setMesFactoryModelDetailList(List<MesFactoryModelDetail> mesFactoryModelDetailList) {
|
||||
this.mesFactoryModelDetailList = mesFactoryModelDetailList;
|
||||
}
|
||||
|
||||
|
||||
public List<MesEquipment> mesEquipmentList;
|
||||
|
||||
public List<MesEquipment> getMesEquipmentList() {
|
||||
return mesEquipmentList;
|
||||
}
|
||||
|
||||
public void setMesEquipmentList(List<MesEquipment> mesEquipmentlist) {
|
||||
this.mesEquipmentList = mesEquipmentlist;
|
||||
}
|
||||
|
||||
public WmsMaterialInfo getMesFactoryModelDetail() {
|
||||
return mesFactoryModelDetail;
|
||||
}
|
||||
|
||||
public void setMesFactoryModelDetail(WmsMaterialInfo mesFactoryModelDetail) {
|
||||
this.mesFactoryModelDetail = mesFactoryModelDetail;
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
package com.neu.carbon.mes.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;
|
||||
|
||||
/**
|
||||
* 工艺建模对象 mes_process_model
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-24
|
||||
*/
|
||||
@ApiModel("工艺建模")
|
||||
public class MesProcessModel extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 编号 */
|
||||
@ApiModelProperty("编号")
|
||||
private Long id;
|
||||
|
||||
/** 物料档案编号 */
|
||||
@ApiModelProperty("物料档案编号")
|
||||
@Excel(name = "物料档案编号")
|
||||
private Long materialId;
|
||||
|
||||
/** 物料档案名称 */
|
||||
@ApiModelProperty("物料档案名称")
|
||||
@Excel(name = "物料档案名称")
|
||||
private String materialIName;
|
||||
|
||||
/** 物料档案型号 */
|
||||
@ApiModelProperty("物料档案型号")
|
||||
@Excel(name = "物料档案型号")
|
||||
private String materialModel;
|
||||
|
||||
/** 工艺名称 */
|
||||
@ApiModelProperty("工艺名称")
|
||||
@Excel(name = "工艺名称")
|
||||
private String processName;
|
||||
|
||||
/** 工艺描述 */
|
||||
@ApiModelProperty("工艺描述")
|
||||
@Excel(name = "工艺描述")
|
||||
private String description;
|
||||
|
||||
/** 单位耗电量 */
|
||||
@ApiModelProperty("单位耗电量")
|
||||
@Excel(name = "单位耗电量")
|
||||
private Long powerConsume;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setMaterialId(Long materialId)
|
||||
{
|
||||
this.materialId = materialId;
|
||||
}
|
||||
|
||||
public Long getMaterialId()
|
||||
{
|
||||
return materialId;
|
||||
}
|
||||
public void setProcessName(String processName)
|
||||
{
|
||||
this.processName = processName;
|
||||
}
|
||||
|
||||
public String getProcessName()
|
||||
{
|
||||
return processName;
|
||||
}
|
||||
public void setDescription(String description)
|
||||
{
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescription()
|
||||
{
|
||||
return description;
|
||||
}
|
||||
public void setPowerConsume(Long powerConsume)
|
||||
{
|
||||
this.powerConsume = powerConsume;
|
||||
}
|
||||
|
||||
public Long getPowerConsume()
|
||||
{
|
||||
return powerConsume;
|
||||
}
|
||||
|
||||
public String getMaterialIName() {
|
||||
return materialIName;
|
||||
}
|
||||
|
||||
public void setMaterialIName(String materialIName) {
|
||||
this.materialIName = materialIName;
|
||||
}
|
||||
|
||||
public String getMaterialModel() {
|
||||
return materialModel;
|
||||
}
|
||||
|
||||
public void setMaterialModel(String materialModel) {
|
||||
this.materialModel = materialModel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("materialId", getMaterialId())
|
||||
.append("processName", getProcessName())
|
||||
.append("description", getDescription())
|
||||
.append("powerConsume", getPowerConsume())
|
||||
.append("remark", getRemark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
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<MesFactoryModel> 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<MesFactoryModelDetail> mesFactoryModelDetailList);
|
||||
|
||||
/**
|
||||
* 批量删除工厂建模明细
|
||||
* @param ids id
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesFactoryModelDetailByProductLineIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 通过id删除工厂建模明细
|
||||
* @param ids ids
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesFactoryModelDetailByProductLineId(Long id);
|
||||
|
||||
/**
|
||||
* 查询工厂建模明细
|
||||
*
|
||||
* @param productLineId 产品线ID
|
||||
* @return 工厂建模明细集合
|
||||
*/
|
||||
|
||||
public List<MesFactoryModelDetail> selectMesFactoryModelDetailByProductLineId(Long productLineId);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.neu.carbon.mes.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.neu.carbon.mes.domain.MesProcessModel;
|
||||
|
||||
/**
|
||||
* 工艺建模Mapper接口
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-24
|
||||
*/
|
||||
public interface MesProcessModelMapper
|
||||
{
|
||||
/**
|
||||
* 查询工艺建模
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 工艺建模
|
||||
*/
|
||||
public MesProcessModel selectMesProcessModelById(Long id);
|
||||
|
||||
/**
|
||||
* 查询工艺建模列表
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 工艺建模集合
|
||||
*/
|
||||
public List<MesProcessModel> selectMesProcessModelList(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 新增工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesProcessModel(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 修改工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesProcessModel(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 删除工艺建模
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProcessModelById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除工艺建模
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProcessModelByIds(Long[] ids);
|
||||
}
|
||||
@ -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<MesProject> 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);
|
||||
}
|
||||
@ -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<MesFactoryModel> 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);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.neu.carbon.mes.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.neu.carbon.mes.domain.MesProcessModel;
|
||||
|
||||
/**
|
||||
* 工艺建模Service接口
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-24
|
||||
*/
|
||||
public interface IMesProcessModelService
|
||||
{
|
||||
/**
|
||||
* 查询工艺建模
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 工艺建模
|
||||
*/
|
||||
public MesProcessModel selectMesProcessModelById(Long id);
|
||||
|
||||
/**
|
||||
* 查询工艺建模列表
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 工艺建模集合
|
||||
*/
|
||||
public List<MesProcessModel> selectMesProcessModelList(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 新增工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesProcessModel(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 修改工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesProcessModel(MesProcessModel mesProcessModel);
|
||||
|
||||
/**
|
||||
* 批量删除工艺建模
|
||||
*
|
||||
* @param ids 需要删除的工艺建模ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProcessModelByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除工艺建模信息
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProcessModelById(Long id);
|
||||
}
|
||||
@ -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<MesProject> 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);
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
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)
|
||||
{
|
||||
MesFactoryModel mesFactoryModel = mesFactoryModelMapper.selectMesFactoryModelById(id);
|
||||
if (mesFactoryModel != null) {
|
||||
List<MesFactoryModelDetail> detailList = mesFactoryModelMapper.selectMesFactoryModelDetailByProductLineId(id);
|
||||
mesFactoryModel.setMesFactoryModelDetailList(detailList);
|
||||
}
|
||||
return mesFactoryModel;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工厂建模列表
|
||||
*
|
||||
* @param mesFactoryModel 工厂建模
|
||||
* @return 工厂建模
|
||||
*/
|
||||
@Override
|
||||
public List<MesFactoryModel> selectMesFactoryModelList(MesFactoryModel mesFactoryModel)
|
||||
{
|
||||
return mesFactoryModelMapper.selectMesFactoryModelList(mesFactoryModel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工厂建模
|
||||
*
|
||||
* @param mesFactoryModel 工厂建模
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertMesFactoryModel(MesFactoryModel mesFactoryModel)
|
||||
{
|
||||
int rows = mesFactoryModelMapper.insertMesFactoryModel(mesFactoryModel);
|
||||
insertMesFactoryModeLDetail(mesFactoryModel);
|
||||
return rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工厂建模
|
||||
*
|
||||
* @param mesFactoryModel 工厂建模
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateMesFactoryModel(MesFactoryModel mesFactoryModel)
|
||||
{
|
||||
mesFactoryModelMapper.deleteMesFactoryModelDetailByProductLineId(mesFactoryModel.getId());
|
||||
insertMesFactoryModeLDetail(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);
|
||||
}
|
||||
|
||||
public void insertMesFactoryModeLDetail(MesFactoryModel mesFactoryModel) {
|
||||
List<MesFactoryModelDetail> mesFactoryModelDetailList = mesFactoryModel.getMesFactoryModelDetailList();
|
||||
Long productLineId = mesFactoryModel.getId(); // 从主表获取 productLineId
|
||||
|
||||
if (StringUtils.isNotNull(mesFactoryModelDetailList)) {
|
||||
List<MesFactoryModelDetail> list = new ArrayList<>();
|
||||
for (MesFactoryModelDetail mesFactoryModeLDetail : mesFactoryModelDetailList) {
|
||||
mesFactoryModeLDetail.setProductLineId(productLineId); // 设置 productLineId
|
||||
mesFactoryModeLDetail.setEquipmentId(mesFactoryModeLDetail.getId()); // 将前端传递的 id 映射为 equipmentId
|
||||
list.add(mesFactoryModeLDetail);
|
||||
}
|
||||
|
||||
if (!list.isEmpty()) {
|
||||
mesFactoryModelMapper.batchMesFactoryModelDetail(list); // 批量插入
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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.MesProcessModelMapper;
|
||||
import com.neu.carbon.mes.domain.MesProcessModel;
|
||||
import com.neu.carbon.mes.service.IMesProcessModelService;
|
||||
|
||||
/**
|
||||
* 工艺建模Service业务层处理
|
||||
*
|
||||
* @author neuedu
|
||||
* @date 2024-11-24
|
||||
*/
|
||||
@Service
|
||||
public class MesProcessModelServiceImpl implements IMesProcessModelService
|
||||
{
|
||||
@Autowired
|
||||
private MesProcessModelMapper mesProcessModelMapper;
|
||||
|
||||
/**
|
||||
* 查询工艺建模
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 工艺建模
|
||||
*/
|
||||
@Override
|
||||
public MesProcessModel selectMesProcessModelById(Long id)
|
||||
{
|
||||
return mesProcessModelMapper.selectMesProcessModelById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工艺建模列表
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 工艺建模
|
||||
*/
|
||||
@Override
|
||||
public List<MesProcessModel> selectMesProcessModelList(MesProcessModel mesProcessModel)
|
||||
{
|
||||
return mesProcessModelMapper.selectMesProcessModelList(mesProcessModel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertMesProcessModel(MesProcessModel mesProcessModel)
|
||||
{
|
||||
return mesProcessModelMapper.insertMesProcessModel(mesProcessModel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工艺建模
|
||||
*
|
||||
* @param mesProcessModel 工艺建模
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateMesProcessModel(MesProcessModel mesProcessModel)
|
||||
{
|
||||
return mesProcessModelMapper.updateMesProcessModel(mesProcessModel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除工艺建模
|
||||
*
|
||||
* @param ids 需要删除的工艺建模ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesProcessModelByIds(Long[] ids)
|
||||
{
|
||||
return mesProcessModelMapper.deleteMesProcessModelByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工艺建模信息
|
||||
*
|
||||
* @param id 工艺建模ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesProcessModelById(Long id)
|
||||
{
|
||||
return mesProcessModelMapper.deleteMesProcessModelById(id);
|
||||
}
|
||||
}
|
||||
@ -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<MesProject> 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);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.neu.carbon.mes.mapper.MesFactoryModelMapper">
|
||||
|
||||
<resultMap type="MesFactoryModel" id="MesFactoryModelResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="materialId" column="material_id" />
|
||||
<result property="productLineName" column="product_line_name" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesFactoryModelVo">
|
||||
select id, material_id, product_line_name, remark from mes_factory_model
|
||||
</sql>
|
||||
|
||||
<select id="selectMesFactoryModelList" parameterType="MesFactoryModel" resultMap="MesFactoryModelResult">
|
||||
<include refid="selectMesFactoryModelVo"/>
|
||||
<where>
|
||||
<if test="materialId != null "> and material_id = #{materialId}</if>
|
||||
<if test="productLineName != null and productLineName != ''"> and product_line_name like concat('%', #{productLineName}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesFactoryModelById" parameterType="Long" resultMap="MesFactoryModelResult">
|
||||
<include refid="selectMesFactoryModelVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesFactoryModel" parameterType="MesFactoryModel" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into mes_factory_model
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id,</if>
|
||||
<if test="productLineName != null">product_line_name,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">#{materialId},</if>
|
||||
<if test="productLineName != null">#{productLineName},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesFactoryModel" parameterType="MesFactoryModel">
|
||||
update mes_factory_model
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id = #{materialId},</if>
|
||||
<if test="productLineName != null">product_line_name = #{productLineName},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesFactoryModelById" parameterType="Long">
|
||||
delete from mes_factory_model where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesFactoryModelByIds" parameterType="String">
|
||||
delete from mes_factory_model where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<insert id="batchMesFactoryModelDetail">
|
||||
insert into mes_factory_model_detail(product_line_id,equipment_id) values
|
||||
<foreach collection="list" item="item" index="index" separator=",">
|
||||
(#{item.productLineId},#{item.equipmentId})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<delete id="deleteMesFactoryModelDetailByProductLineIds">
|
||||
delete from mes_factory_model_detail where product_line_id in
|
||||
<foreach collection="array" item="id" index="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesFactoryModelDetailByProductLineId" parameterType="Long">
|
||||
delete from mes_factory_model_detail where product_line_id = #{productLineId}
|
||||
</delete>
|
||||
|
||||
|
||||
<resultMap id="MesFactoryModelDetailResultMap" type="MesFactoryModelDetail">
|
||||
<result property="id" column="id"/>
|
||||
<result property="productLineId" column="product_line_id"/>
|
||||
<result property="equipmentId" column="equipment_id"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectMesFactoryModelDetailByProductLineId" parameterType="Long" resultMap="MesFactoryModelDetailResultMap">
|
||||
SELECT id, product_line_id, equipment_id
|
||||
FROM mes_factory_model_detail
|
||||
WHERE product_line_id = #{productLineId}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,75 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.neu.carbon.mes.mapper.MesProcessModelMapper">
|
||||
|
||||
<resultMap type="MesProcessModel" id="MesProcessModelResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="materialId" column="material_id" />
|
||||
<result property="processName" column="process_name" />
|
||||
<result property="description" column="description" />
|
||||
<result property="powerConsume" column="power_consume" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesProcessModelVo">
|
||||
select id, material_id, process_name, description, power_consume, remark from mes_process_model
|
||||
</sql>
|
||||
|
||||
<select id="selectMesProcessModelList" parameterType="MesProcessModel" resultMap="MesProcessModelResult">
|
||||
<include refid="selectMesProcessModelVo"/>
|
||||
<where>
|
||||
<if test="materialId != null "> and material_id = #{materialId}</if>
|
||||
<if test="processName != null and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
|
||||
<if test="description != null and description != ''"> and description = #{description}</if>
|
||||
<if test="powerConsume != null "> and power_consume = #{powerConsume}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesProcessModelById" parameterType="Long" resultMap="MesProcessModelResult">
|
||||
<include refid="selectMesProcessModelVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesProcessModel" parameterType="MesProcessModel" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into mes_process_model
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id,</if>
|
||||
<if test="processName != null and processName != ''">process_name,</if>
|
||||
<if test="description != null">description,</if>
|
||||
<if test="powerConsume != null">power_consume,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">#{materialId},</if>
|
||||
<if test="processName != null and processName != ''">#{processName},</if>
|
||||
<if test="description != null">#{description},</if>
|
||||
<if test="powerConsume != null">#{powerConsume},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesProcessModel" parameterType="MesProcessModel">
|
||||
update mes_process_model
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id = #{materialId},</if>
|
||||
<if test="processName != null and processName != ''">process_name = #{processName},</if>
|
||||
<if test="description != null">description = #{description},</if>
|
||||
<if test="powerConsume != null">power_consume = #{powerConsume},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesProcessModelById" parameterType="Long">
|
||||
delete from mes_process_model where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesProcessModelByIds" parameterType="String">
|
||||
delete from mes_process_model where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,96 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.neu.carbon.mes.mapper.MesFactoryModelMapper">
|
||||
|
||||
<resultMap type="MesFactoryModel" id="MesFactoryModelResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="materialId" column="material_id" />
|
||||
<result property="productLineName" column="product_line_name" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesFactoryModelVo">
|
||||
select id, material_id, product_line_name, remark from mes_factory_model
|
||||
</sql>
|
||||
|
||||
<select id="selectMesFactoryModelList" parameterType="MesFactoryModel" resultMap="MesFactoryModelResult">
|
||||
<include refid="selectMesFactoryModelVo"/>
|
||||
<where>
|
||||
<if test="materialId != null "> and material_id = #{materialId}</if>
|
||||
<if test="productLineName != null and productLineName != ''"> and product_line_name like concat('%', #{productLineName}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesFactoryModelById" parameterType="Long" resultMap="MesFactoryModelResult">
|
||||
<include refid="selectMesFactoryModelVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesFactoryModel" parameterType="MesFactoryModel" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into mes_factory_model
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id,</if>
|
||||
<if test="productLineName != null">product_line_name,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">#{materialId},</if>
|
||||
<if test="productLineName != null">#{productLineName},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesFactoryModel" parameterType="MesFactoryModel">
|
||||
update mes_factory_model
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id = #{materialId},</if>
|
||||
<if test="productLineName != null">product_line_name = #{productLineName},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesFactoryModelById" parameterType="Long">
|
||||
delete from mes_factory_model where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesFactoryModelByIds" parameterType="String">
|
||||
delete from mes_factory_model where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<insert id="batchMesFactoryModelDetail">
|
||||
insert into mes_factory_model_detail(product_line_id,equipment_id) values
|
||||
<foreach collection="list" item="item" index="index" separator=",">
|
||||
(#{item.productLineId},#{item.equipmentId})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<delete id="deleteMesFactoryModelDetailByProductLineIds">
|
||||
delete from mes_factory_model_detail where product_line_id in
|
||||
<foreach collection="array" item="id" index="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesFactoryModelDetailByProductLineId" parameterType="Long">
|
||||
delete from mes_factory_model_detail where product_line_id = #{productLineId}
|
||||
</delete>
|
||||
|
||||
|
||||
<resultMap id="MesFactoryModelDetailResultMap" type="MesFactoryModelDetail">
|
||||
<result property="id" column="id"/>
|
||||
<result property="productLineId" column="product_line_id"/>
|
||||
<result property="equipmentId" column="equipment_id"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectMesFactoryModelDetailByProductLineId" parameterType="Long" resultMap="MesFactoryModelDetailResultMap">
|
||||
SELECT id, product_line_id, equipment_id
|
||||
FROM mes_factory_model_detail
|
||||
WHERE product_line_id = #{productLineId}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,75 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.neu.carbon.mes.mapper.MesProcessModelMapper">
|
||||
|
||||
<resultMap type="MesProcessModel" id="MesProcessModelResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="materialId" column="material_id" />
|
||||
<result property="processName" column="process_name" />
|
||||
<result property="description" column="description" />
|
||||
<result property="powerConsume" column="power_consume" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesProcessModelVo">
|
||||
select id, material_id, process_name, description, power_consume, remark from mes_process_model
|
||||
</sql>
|
||||
|
||||
<select id="selectMesProcessModelList" parameterType="MesProcessModel" resultMap="MesProcessModelResult">
|
||||
<include refid="selectMesProcessModelVo"/>
|
||||
<where>
|
||||
<if test="materialId != null "> and material_id = #{materialId}</if>
|
||||
<if test="processName != null and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
|
||||
<if test="description != null and description != ''"> and description = #{description}</if>
|
||||
<if test="powerConsume != null "> and power_consume = #{powerConsume}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesProcessModelById" parameterType="Long" resultMap="MesProcessModelResult">
|
||||
<include refid="selectMesProcessModelVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesProcessModel" parameterType="MesProcessModel" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into mes_process_model
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id,</if>
|
||||
<if test="processName != null and processName != ''">process_name,</if>
|
||||
<if test="description != null">description,</if>
|
||||
<if test="powerConsume != null">power_consume,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="materialId != null">#{materialId},</if>
|
||||
<if test="processName != null and processName != ''">#{processName},</if>
|
||||
<if test="description != null">#{description},</if>
|
||||
<if test="powerConsume != null">#{powerConsume},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesProcessModel" parameterType="MesProcessModel">
|
||||
update mes_process_model
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="materialId != null">material_id = #{materialId},</if>
|
||||
<if test="processName != null and processName != ''">process_name = #{processName},</if>
|
||||
<if test="description != null">description = #{description},</if>
|
||||
<if test="powerConsume != null">power_consume = #{powerConsume},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesProcessModelById" parameterType="Long">
|
||||
delete from mes_process_model where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesProcessModelByIds" parameterType="String">
|
||||
delete from mes_process_model where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
BIN
neu-carbon-wms.zip
Normal file
BIN
neu-carbon-wms.zip
Normal file
Binary file not shown.
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
@ -1,9 +1,20 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnull=org.springframework.lang.NonNull
|
||||
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.springframework.lang.NonNullApi
|
||||
org.eclipse.jdt.core.compiler.annotation.nullable=org.springframework.lang.Nullable
|
||||
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
|
||||
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
|
||||
org.eclipse.jdt.core.compiler.processAnnotations=enabled
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user