Skip to content

资
资产管理
提交 63f81a83 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_gzf 部署微服务接口

上级 12e39fc1
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 813 行增加 和 51 行删除
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile
浏览文件 @ 63f81a83
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
EXPOSE 10325
EXPOSE 8080
ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml
浏览文件 @ 63f81a83
......@@ -3,25 +3,9 @@ services:
assetmanagement-app-assetmanagement:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
ports:
- "10325:10325"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10325
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/resources/application-assetmanagement-prod.yml
浏览文件 @ 63f81a83
......@@ -23,6 +23,10 @@ zuul:
path: /eamlocations/**
serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
stripPrefix: false
eammonitorpoint:
path: /eammonitorpoints/**
serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
stripPrefix: false
eamassetstate:
path: /eamassetstates/**
serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/domain/EAMPlan.java
浏览文件 @ 63f81a83
......@@ -153,6 +153,13 @@ public class EAMPlan extends EntityMP implements Serializable {
@JSONField(name = "mdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("mdate")
private Timestamp mdate;
/**
* 内容
*/
@TableField(value = "content")
@JSONField(name = "content")
@JsonProperty("content")
private String content;
/**
*
......@@ -246,6 +253,14 @@ public class EAMPlan extends EntityMP implements Serializable {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(mdate);
}
/**
* 设置 [内容]
*/
public void setContent(String content){
this.content = content ;
this.modify("content",content);
}
}
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/domain/EAMPlanLine.java
浏览文件 @ 63f81a83
......@@ -110,6 +110,55 @@ public class EAMPlanLine extends EntityMP implements Serializable {
@JSONField(name = "assetid")
@JsonProperty("assetid")
private String assetid;
/**
* 序号
*/
@TableField(value = "sortnumber")
@JSONField(name = "sortnumber")
@JsonProperty("sortnumber")
private Integer sortnumber;
/**
* 内容
*/
@TableField(value = "content")
@JSONField(name = "content")
@JsonProperty("content")
private String content;
/**
* 维护计划
*/
@TableField(exist = false)
@JSONField(name = "eamplanname")
@JsonProperty("eamplanname")
private String eamplanname;
/**
* 资产
*/
@TableField(exist = false)
@JSONField(name = "assetname")
@JsonProperty("assetname")
private String assetname;
/**
* 功能位置
*/
@TableField(exist = false)
@JSONField(name = "eamlocationname")
@JsonProperty("eamlocationname")
private String eamlocationname;
/**
* 测点标识
*/
@TableField(value = "eammonitorpointid")
@JSONField(name = "eammonitorpointid")
@JsonProperty("eammonitorpointid")
private String eammonitorpointid;
/**
* 测点
*/
@TableField(exist = false)
@JSONField(name = "eammonitorpointname")
@JsonProperty("eammonitorpointname")
private String eammonitorpointname;
/**
*
......@@ -127,6 +176,14 @@ public class EAMPlanLine extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.assetmanagement.core.location.domain.EAMLocation eamlocation;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.assetmanagement.core.workorder.domain.EAMMonitorPoint eammonitorpoint;
/**
*
*/
......@@ -169,6 +226,30 @@ public class EAMPlanLine extends EntityMP implements Serializable {
this.modify("assetid",assetid);
}
/**
* 设置 [序号]
*/
public void setSortnumber(Integer sortnumber){
this.sortnumber = sortnumber ;
this.modify("sortnumber",sortnumber);
}
/**
* 设置 [内容]
*/
public void setContent(String content){
this.content = content ;
this.modify("content",content);
}
/**
* 设置 [测点标识]
*/
public void setEammonitorpointid(String eammonitorpointid){
this.eammonitorpointid = eammonitorpointid ;
this.modify("eammonitorpointid",eammonitorpointid);
}
}
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/filter/EAMPlanLineSearchContext.java
浏览文件 @ 63f81a83
......@@ -55,6 +55,69 @@ public class EAMPlanLineSearchContext extends QueryWrapperContext<EAMPlanLine> {
this.getSearchCond().eq("assetid", n_assetid_eq);
}
}
private String n_eamplanname_eq;//[维护计划]
public void setN_eamplanname_eq(String n_eamplanname_eq) {
this.n_eamplanname_eq = n_eamplanname_eq;
if(!ObjectUtils.isEmpty(this.n_eamplanname_eq)){
this.getSearchCond().eq("eamplanname", n_eamplanname_eq);
}
}
private String n_eamplanname_like;//[维护计划]
public void setN_eamplanname_like(String n_eamplanname_like) {
this.n_eamplanname_like = n_eamplanname_like;
if(!ObjectUtils.isEmpty(this.n_eamplanname_like)){
this.getSearchCond().like("eamplanname", n_eamplanname_like);
}
}
private String n_assetname_eq;//[资产]
public void setN_assetname_eq(String n_assetname_eq) {
this.n_assetname_eq = n_assetname_eq;
if(!ObjectUtils.isEmpty(this.n_assetname_eq)){
this.getSearchCond().eq("assetname", n_assetname_eq);
}
}
private String n_assetname_like;//[资产]
public void setN_assetname_like(String n_assetname_like) {
this.n_assetname_like = n_assetname_like;
if(!ObjectUtils.isEmpty(this.n_assetname_like)){
this.getSearchCond().like("assetname", n_assetname_like);
}
}
private String n_eamlocationname_eq;//[功能位置]
public void setN_eamlocationname_eq(String n_eamlocationname_eq) {
this.n_eamlocationname_eq = n_eamlocationname_eq;
if(!ObjectUtils.isEmpty(this.n_eamlocationname_eq)){
this.getSearchCond().eq("eamlocationname", n_eamlocationname_eq);
}
}
private String n_eamlocationname_like;//[功能位置]
public void setN_eamlocationname_like(String n_eamlocationname_like) {
this.n_eamlocationname_like = n_eamlocationname_like;
if(!ObjectUtils.isEmpty(this.n_eamlocationname_like)){
this.getSearchCond().like("eamlocationname", n_eamlocationname_like);
}
}
private String n_eammonitorpointid_eq;//[测点标识]
public void setN_eammonitorpointid_eq(String n_eammonitorpointid_eq) {
this.n_eammonitorpointid_eq = n_eammonitorpointid_eq;
if(!ObjectUtils.isEmpty(this.n_eammonitorpointid_eq)){
this.getSearchCond().eq("eammonitorpointid", n_eammonitorpointid_eq);
}
}
private String n_eammonitorpointname_eq;//[测点]
public void setN_eammonitorpointname_eq(String n_eammonitorpointname_eq) {
this.n_eammonitorpointname_eq = n_eammonitorpointname_eq;
if(!ObjectUtils.isEmpty(this.n_eammonitorpointname_eq)){
this.getSearchCond().eq("eammonitorpointname", n_eammonitorpointname_eq);
}
}
private String n_eammonitorpointname_like;//[测点]
public void setN_eammonitorpointname_like(String n_eammonitorpointname_like) {
this.n_eammonitorpointname_like = n_eammonitorpointname_like;
if(!ObjectUtils.isEmpty(this.n_eammonitorpointname_like)){
this.getSearchCond().like("eammonitorpointname", n_eammonitorpointname_like);
}
}
/**
* 启用快速搜索
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/mapper/EAMPlanLineMapper.java
浏览文件 @ 63f81a83
......@@ -66,6 +66,8 @@ public interface EAMPlanLineMapper extends BaseMapper<EAMPlanLine>{
List<EAMPlanLine> selectByEamlocationid(@Param("eamlocationid") Serializable eamlocationid) ;
List<EAMPlanLine> selectByEammonitorpointid(@Param("eammonitorpointid") Serializable eammonitorpointid) ;
List<EAMPlanLine> selectByEamplanid(@Param("eamplanid") Serializable eamplanid) ;
}
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/IEAMPlanLineService.java
浏览文件 @ 63f81a83
......@@ -41,6 +41,8 @@ public interface IEAMPlanLineService extends IService<EAMPlanLine>{
void removeByAssetid(String assetid) ;
List<EAMPlanLine> selectByEamlocationid(String eamlocationid) ;
void removeByEamlocationid(String eamlocationid) ;
List<EAMPlanLine> selectByEammonitorpointid(String eammonitorpointid) ;
void removeByEammonitorpointid(String eammonitorpointid) ;
List<EAMPlanLine> selectByEamplanid(String eamplanid) ;
void removeByEamplanid(String eamplanid) ;
/**
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/impl/EAMPlanLineServiceImpl.java
浏览文件 @ 63f81a83
......@@ -53,6 +53,9 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
protected cn.ibizlab.assetmanagement.core.location.service.IEAMLocationService eamlocationService;
@Autowired
@Lazy
protected cn.ibizlab.assetmanagement.core.workorder.service.IEAMMonitorPointService eammonitorpointService;
@Autowired
@Lazy
protected cn.ibizlab.assetmanagement.core.plan.service.IEAMPlanService eamplanService;
protected int batchSize = 500;
......@@ -60,6 +63,7 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
@Override
@Transactional
public boolean create(EAMPlanLine et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et)))
return false;
CachedBeanCopier.copy(get(et.getEamplanlineid()),et);
......@@ -68,12 +72,14 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
@Override
public void createBatch(List<EAMPlanLine> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(EAMPlanLine et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamplanlineid",et.getEamplanlineid())))
return false;
CachedBeanCopier.copy(get(et.getEamplanlineid()),et);
......@@ -82,6 +88,7 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
@Override
public void updateBatch(List<EAMPlanLine> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
}
......@@ -112,6 +119,7 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
@Override
public EAMPlanLine getDraft(EAMPlanLine et) {
fillParentData(et);
return et;
}
......@@ -139,12 +147,14 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
@Override
public boolean saveBatch(Collection<EAMPlanLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public void saveBatch(List<EAMPlanLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
......@@ -169,6 +179,16 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
this.remove(new QueryWrapper<EAMPlanLine>().eq("eamlocationid",eamlocationid));
}
@Override
public List<EAMPlanLine> selectByEammonitorpointid(String eammonitorpointid) {
return baseMapper.selectByEammonitorpointid(eammonitorpointid);
}
@Override
public void removeByEammonitorpointid(String eammonitorpointid) {
this.remove(new QueryWrapper<EAMPlanLine>().eq("eammonitorpointid",eammonitorpointid));
}
@Override
public List<EAMPlanLine> selectByEamplanid(String eamplanid) {
return baseMapper.selectByEamplanid(eamplanid);
......@@ -191,6 +211,52 @@ public class EAMPlanLineServiceImpl extends ServiceImpl<EAMPlanLineMapper, EAMPl
/**
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(EAMPlanLine et){
//实体关系[DER1N_EAMPLANLINE_EAMASSET_ASSETID]
if(!ObjectUtils.isEmpty(et.getAssetid())){
cn.ibizlab.assetmanagement.core.asset.domain.EAMAsset asset=et.getAsset();
if(ObjectUtils.isEmpty(asset)){
cn.ibizlab.assetmanagement.core.asset.domain.EAMAsset majorEntity=eamassetService.get(et.getAssetid());
et.setAsset(majorEntity);
asset=majorEntity;
}
et.setAssetname(asset.getAssetname());
}
//实体关系[DER1N_EAMPLANLINE_EAMLOCATION_EAMLOCATIONID]
if(!ObjectUtils.isEmpty(et.getEamlocationid())){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocation eamlocation=et.getEamlocation();
if(ObjectUtils.isEmpty(eamlocation)){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocation majorEntity=eamlocationService.get(et.getEamlocationid());
et.setEamlocation(majorEntity);
eamlocation=majorEntity;
}
et.setEamlocationname(eamlocation.getEamlocationname());
}
//实体关系[DER1N_EAMPLANLINE_EAMMONITORPOINT_EAMMONITORPOINTID]
if(!ObjectUtils.isEmpty(et.getEammonitorpointid())){
cn.ibizlab.assetmanagement.core.workorder.domain.EAMMonitorPoint eammonitorpoint=et.getEammonitorpoint();
if(ObjectUtils.isEmpty(eammonitorpoint)){
cn.ibizlab.assetmanagement.core.workorder.domain.EAMMonitorPoint majorEntity=eammonitorpointService.get(et.getEammonitorpointid());
et.setEammonitorpoint(majorEntity);
eammonitorpoint=majorEntity;
}
et.setEammonitorpointname(eammonitorpoint.getEammonitorpointname());
}
//实体关系[DER1N_EAMPLANLINE_EAMPLAN_EAMPLANID]
if(!ObjectUtils.isEmpty(et.getEamplanid())){
cn.ibizlab.assetmanagement.core.plan.domain.EAMPlan eamplan=et.getEamplan();
if(ObjectUtils.isEmpty(eamplan)){
cn.ibizlab.assetmanagement.core.plan.domain.EAMPlan majorEntity=eamplanService.get(et.getEamplanid());
et.setEamplan(majorEntity);
eamplan=majorEntity;
}
et.setEamplanname(eamplan.getEamplanname());
}
}
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMMonitorPointServiceImpl.java
浏览文件 @ 63f81a83
......@@ -45,6 +45,9 @@ import org.springframework.util.StringUtils;
@Service("EAMMonitorPointServiceImpl")
public class EAMMonitorPointServiceImpl extends ServiceImpl<EAMMonitorPointMapper, EAMMonitorPoint> implements IEAMMonitorPointService {
@Autowired
@Lazy
protected cn.ibizlab.assetmanagement.core.plan.service.IEAMPlanLineService eamplanlineService;
@Autowired
@Lazy
protected cn.ibizlab.assetmanagement.core.plan.service.IEAMPlanService eamplanService;
......
assetmanagement-core/src/main/resources/mapper/plan/eamplan/EAMPlanMapper.xml
浏览文件 @ 63f81a83
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="EAMPlanResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID ) t1 where eamplanid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID ) t1 where eamplanid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -57,12 +57,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID
<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID
<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t31.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANNAME`, t1.`MDATE`, t1.`PLANNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLAN` t1 LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t31 ON t1.EAMMONITORPOINTID = t31.EAMMONITORPOINTID
]]>
</sql>
</mapper>
......
assetmanagement-core/src/main/resources/mapper/plan/eamplanline/EAMPlanLineMapper.xml
浏览文件 @ 63f81a83
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="EAMPlanLineResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1 ) t1 where eamplanlineid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t21.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t31.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t41.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t11.`EAMPLANNAME`, t1.`SORTNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1 LEFT JOIN EAMPLAN t11 ON t1.EAMPLANID = t11.EAMPLANID LEFT JOIN ASSET t21 ON t1.ASSETID = t21.ASSETID LEFT JOIN EAMLOCATION t31 ON t1.EAMLOCATIONID = t31.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t41 ON t1.EAMMONITORPOINTID = t41.EAMMONITORPOINTID ) t1 where eamplanlineid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -14,6 +14,7 @@
<result property="eamplanid" column="eamplanid" />
<result property="eamlocationid" column="eamlocationid" />
<result property="assetid" column="assetid" />
<result property="eammonitorpointid" column="eammonitorpointid" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
......@@ -21,6 +22,8 @@
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="eamlocation" javaType="cn.ibizlab.assetmanagement.core.location.domain.EAMLocation" column="eamlocationid" select="cn.ibizlab.assetmanagement.core.location.mapper.EAMLocationMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="eammonitorpoint" javaType="cn.ibizlab.assetmanagement.core.workorder.domain.EAMMonitorPoint" column="eammonitorpointid" select="cn.ibizlab.assetmanagement.core.workorder.mapper.EAMMonitorPointMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="eamplan" javaType="cn.ibizlab.assetmanagement.core.plan.domain.EAMPlan" column="eamplanid" select="cn.ibizlab.assetmanagement.core.plan.mapper.EAMPlanMapper.selectById" fetchType="lazy"></association>
</resultMap>
......@@ -37,6 +40,13 @@
<include refid="Default" />
) t1
where eamlocationid=#{eamlocationid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMPLANLINE_EAMMONITORPOINT_EAMMONITORPOINTID] -->
<select id="selectByEammonitorpointid" resultMap="EAMPlanLineResultMap">
select t1.* from (
<include refid="Default" />
) t1
where eammonitorpointid=#{eammonitorpointid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMPLANLINE_EAMPLAN_EAMPLANID] -->
<select id="selectByEamplanid" resultMap="EAMPlanLineResultMap">
......@@ -57,12 +67,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1
<![CDATA[ SELECT t1.`ASSETID`, t21.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t31.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t41.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t11.`EAMPLANNAME`, t1.`SORTNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1 LEFT JOIN EAMPLAN t11 ON t1.EAMPLANID = t11.EAMPLANID LEFT JOIN ASSET t21 ON t1.ASSETID = t21.ASSETID LEFT JOIN EAMLOCATION t31 ON t1.EAMLOCATIONID = t31.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t41 ON t1.EAMMONITORPOINTID = t41.EAMMONITORPOINTID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1
<![CDATA[ SELECT t1.`ASSETID`, t21.`ASSETNAME`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONID`, t31.`EAMLOCATIONNAME`, t1.`EAMMONITORPOINTID`, t41.`EAMMONITORPOINTNAME`, t1.`EAMPLANID`, t1.`EAMPLANLINEID`, t1.`EAMPLANLINENAME`, t11.`EAMPLANNAME`, t1.`SORTNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMPLANLINE` t1 LEFT JOIN EAMPLAN t11 ON t1.EAMPLANID = t11.EAMPLANID LEFT JOIN ASSET t21 ON t1.ASSETID = t21.ASSETID LEFT JOIN EAMLOCATION t31 ON t1.EAMLOCATIONID = t31.EAMLOCATIONID LEFT JOIN EAMMONITORPOINT t41 ON t1.EAMMONITORPOINTID = t41.EAMMONITORPOINTID
]]>
</sql>
</mapper>
......
assetmanagement-core/src/main/resources/permission/systemResource.json
浏览文件 @ 63f81a83
......@@ -36,6 +36,14 @@
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
}
, {
"dename":"EAMMonitorPoint",
"delogicname":"测点",
"sysmoudle":{"id":"WORKORDER","name":"工单管理"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
}
, {
"dename":"EAMAssetState",
"delogicname":"资产状态",
"sysmoudle":{"id":"ASSET","name":"资产管理"},
......
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/Dockerfile
浏览文件 @ 63f81a83
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-provider-assetapi.jar
EXPOSE 8081
EXPOSE 10315
ADD assetmanagement-provider-assetapi.jar /assetmanagement-provider-assetapi.jar
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml
浏览文件 @ 63f81a83
......@@ -3,9 +3,25 @@ services:
assetmanagement-provider-assetapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-provider-assetapi:latest
ports:
- "8081:8081"
- "10315:10315"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10315
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMMonitorPointDTO.java 0 → 100644
浏览文件 @ 63f81a83
package cn.ibizlab.assetmanagement.assetapi.dto;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.math.BigInteger;
import java.util.Map;
import java.util.HashMap;
import java.io.Serializable;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.fastjson.annotation.JSONField;
import cn.ibizlab.assetmanagement.util.domain.DTOBase;
import cn.ibizlab.assetmanagement.util.domain.DTOClient;
import lombok.Data;
/**
* 服务DTO对象[EAMMonitorPointDTO]
*/
@Data
public class EAMMonitorPointDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 属性 [EAMMONITORPOINTID]
*
*/
@JSONField(name = "eammonitorpointid")
@JsonProperty("eammonitorpointid")
private String eammonitorpointid;
/**
* 属性 [EAMMONITORPOINTNAME]
*
*/
@JSONField(name = "eammonitorpointname")
@JsonProperty("eammonitorpointname")
private String eammonitorpointname;
/**
* 属性 [UPDATEMAN]
*
*/
@JSONField(name = "updateman")
@JsonProperty("updateman")
private String updateman;
/**
* 属性 [UPDATEDATE]
*
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 属性 [CREATEDATE]
*
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate")
private Timestamp createdate;
/**
* 属性 [CREATEMAN]
*
*/
@JSONField(name = "createman")
@JsonProperty("createman")
private String createman;
/**
* 设置 [EAMMONITORPOINTNAME]
*/
public void setEammonitorpointname(String eammonitorpointname){
this.eammonitorpointname = eammonitorpointname ;
this.modify("eammonitorpointname",eammonitorpointname);
}
}
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMPlanDTO.java
浏览文件 @ 63f81a83
......@@ -147,6 +147,14 @@ public class EAMPlanDTO extends DTOBase implements Serializable {
@JsonProperty("mdate")
private Timestamp mdate;
/**
* 属性 [CONTENT]
*
*/
@JSONField(name = "content")
@JsonProperty("content")
private String content;
/**
* 设置 [EAMPLANNAME]
......@@ -204,6 +212,14 @@ public class EAMPlanDTO extends DTOBase implements Serializable {
this.modify("mdate",mdate);
}
/**
* 设置 [CONTENT]
*/
public void setContent(String content){
this.content = content ;
this.modify("content",content);
}
}
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMPlanLineDTO.java
浏览文件 @ 63f81a83
......@@ -98,6 +98,62 @@ public class EAMPlanLineDTO extends DTOBase implements Serializable {
@JsonProperty("assetid")
private String assetid;
/**
* 属性 [SORTNUMBER]
*
*/
@JSONField(name = "sortnumber")
@JsonProperty("sortnumber")
private Integer sortnumber;
/**
* 属性 [CONTENT]
*
*/
@JSONField(name = "content")
@JsonProperty("content")
private String content;
/**
* 属性 [EAMPLANNAME]
*
*/
@JSONField(name = "eamplanname")
@JsonProperty("eamplanname")
private String eamplanname;
/**
* 属性 [ASSETNAME]
*
*/
@JSONField(name = "assetname")
@JsonProperty("assetname")
private String assetname;
/**
* 属性 [EAMLOCATIONNAME]
*
*/
@JSONField(name = "eamlocationname")
@JsonProperty("eamlocationname")
private String eamlocationname;
/**
* 属性 [EAMMONITORPOINTID]
*
*/
@JSONField(name = "eammonitorpointid")
@JsonProperty("eammonitorpointid")
private String eammonitorpointid;
/**
* 属性 [EAMMONITORPOINTNAME]
*
*/
@JSONField(name = "eammonitorpointname")
@JsonProperty("eammonitorpointname")
private String eammonitorpointname;
/**
* 设置 [EAMPLANLINENAME]
......@@ -131,6 +187,30 @@ public class EAMPlanLineDTO extends DTOBase implements Serializable {
this.modify("assetid",assetid);
}
/**
* 设置 [SORTNUMBER]
*/
public void setSortnumber(Integer sortnumber){
this.sortnumber = sortnumber ;
this.modify("sortnumber",sortnumber);
}
/**
* 设置 [CONTENT]
*/
public void setContent(String content){
this.content = content ;
this.modify("content",content);
}
/**
* 设置 [EAMMONITORPOINTID]
*/
public void setEammonitorpointid(String eammonitorpointid){
this.eammonitorpointid = eammonitorpointid ;
this.modify("eammonitorpointid",eammonitorpointid);
}
}
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/mapping/EAMMonitorPointMapping.java 0 → 100644
浏览文件 @ 63f81a83
package cn.ibizlab.assetmanagement.assetapi.mapping;
import org.mapstruct.*;
import cn.ibizlab.assetmanagement.core.workorder.domain.EAMMonitorPoint;
import cn.ibizlab.assetmanagement.assetapi.dto.EAMMonitorPointDTO;
import cn.ibizlab.assetmanagement.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="AssetApiEAMMonitorPointMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface EAMMonitorPointMapping extends MappingBase<EAMMonitorPointDTO, EAMMonitorPoint> {
}
config.xml
浏览文件 @ 63f81a83
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizassetmanagement/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizassetmanagement/
mvn clean package -Passetmanagement
cd assetmanagement-app/assetmanagement-app-assetmanagement
mvn -Passetmanagement docker:build
mvn -Passetmanagement docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
mvn clean package -Passetapi
cd assetmanagement-provider/assetmanagement-provider-assetapi
mvn -Passetapi docker:build
mvn -Passetapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-provider-assetapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或