Skip to content

A
amos-boot-biz
Commit 7f7958c5 authored by zhangsen's avatar zhangsen
Browse files
Options

巡检相关提交

parent 9d58f371
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 34 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @ 7f7958c5
......@@ -137,4 +137,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
OrgUsr queryByCompanyCode(@Param("companyCode") String companyCode);
List<OrgUsrSyncDto>getOrgUsrSyncDataList(Map<String, Object> map);
List<OrgUsr> companyTreeByUserToPatrolRoute(Map<String, Object> param);
String getBizOrgCodeByOrgCode(String orgCode);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 7f7958c5
......@@ -1153,4 +1153,26 @@ LEFT JOIN (
GROUP BY
u.sequence_nbr
</select>
<select id="companyTreeByUserToPatrolRoute" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
SELECT
usr.*,
(select count(1) from cb_org_usr u where u.biz_org_type = 'PERSON' and u.is_delete = false and u.biz_org_code like CONCAT(usr.biz_org_code,'%')) as total
FROM
cb_org_usr usr
where
(usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT') and usr.biz_org_code like concat (#{bizOrgCode},'%')
and usr.is_delete = false
</select>
<select id="getBizOrgCodeByOrgCode" resultType="java.lang.String">
SELECT
biz_org_code
FROM
cb_org_usr
where
is_delete = false
and amos_org_code = #{orgCode}
limit 1
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/RoutePointItem.java
View file @ 7f7958c5
......@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference;
*/
@Entity
@Table(name="p_route_point_item")
@TableName("p_route_point_item")
//@TableName("p_route_point_item")
@NamedQuery(name="RoutePointItem.findAll", query="SELECT r FROM RoutePointItem r")
public class RoutePointItem extends BasicEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 7f7958c5
......@@ -509,6 +509,16 @@ public class OrgUsrController extends BaseController {
return ResponseHelper.buildResponse(menus);
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/companyTreeByUserToPatrolRoute", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据登录人获取公司部门树【部门账号登录可查看上级单位】", notes = "根据登录人获取公司部门树")
public ResponseModel<List<OrgMenuDto>> companyTreeByUserToPatrolRoute() {
// 获取登陆人角色
ReginParams reginParams = getSelectedOrgInfo();
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserToPatrolRoute(reginParams);
return ResponseHelper.buildResponse(menus);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/companyTreeByUserAndTypeToPartol", method = RequestMethod.GET)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 7f7958c5
......@@ -2861,7 +2861,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
Map<String, Object> param = new HashMap<>();
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
param.put("bizOrgCode", StringUtils.isEmpty(reginParams.getPersonIdentity().getCompanyBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : reginParams.getPersonIdentity().getCompanyBizOrgCode());
param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
return buildTreeParallel(list);
}
......@@ -3483,4 +3483,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return baseMapper.selectList(wrapper);
}
public List<OrgMenuDto> companyTreeByUserToPatrolRoute(ReginParams reginParams) {
Map<String, Object> param = new HashMap<>();
String bizOrgCode = orgUsrMapper.getBizOrgCodeByOrgCode(reginParams.getCompany().getOrgCode());
param.put("bizOrgCode", bizOrgCode);
List<OrgUsr> list = orgUsrMapper.companyTreeByUserToPatrolRoute(param);
return buildTreeParallel(list);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @ 7f7958c5
......@@ -217,9 +217,8 @@ public class PointController extends AbstractBaseController {
newPointClassify.setDataSourceName(pointClassify.getDataSourceName());
newPointClassify.setAddress(pointClassify.getAddress());
newPointClassify.setBuildingId(pointClassify.getBuildingId());
if(pointClassify.getBuildingName()==null){
if(pointClassify.getBuildingName()==null && !StringUtils.isEmpty(pointClassify.getBuildingId())){
FeignClientResult responseModel = equipFeign.getBuildingTreeOne(pointClassify.getBuildingId());
if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
throw new RuntimeException(responseModel.getDevMessage());
}else{
......@@ -297,7 +296,9 @@ public class PointController extends AbstractBaseController {
routePointItem.setPointClassifyId(classifyId);
routePointItem.setPointInputItemId(pointInputItem.getId());
routePointItem.setRoutePointId(routePoint.getId());
routePointItemMapper.insert(routePointItem);
routePointItem.setCreatorId(routePoint.getCreatorId().toString());
routePointItem.setCreateDate(new Date());
routePointItemMapper.insertRoutePointItem(routePointItem);
// iRoutePointItemDao.save(routePointItem);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RoutePointItemMapper.java
View file @ 7f7958c5
package com.yeejoin.amos.patrol.business.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface RoutePointItemMapper extends BaseMapper<RoutePointItem> {
public interface RoutePointItemMapper extends BaseMapper {
public void updateRoutePointItem( RoutePointItem pointItem);
int delRoutePointItemByRouteId(Long routeId);
int delRoutePointItemByPointId(Long pointId);
public void insertRoutePointItem(RoutePointItem pointItem);
}
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 7f7958c5
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url = jdbc:mysql://172.16.10.215/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -14,14 +14,15 @@ spring.datasource.hikari.connection-test-query= SELECT 1
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
fileserver_domain=http://172.16.11.201:9000/
fileserver_domain=http://172.16.10.215:9000/
#eureka.instance.ip-address= 172.16.3.135
eureka.instance.hostname= 172.16.11.201
eureka.instance.hostname= 172.16.10.215
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.215:10001/eureka/
spring.security.user.name=admin
spring.security.user.password=a1234560
#security config
#security.password=a1234560
#security.loginId=fas_system
......@@ -38,9 +39,9 @@ amos.system.user.product=STUDIO_APP_WEB
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.host=172.16.10.215
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -50,10 +51,10 @@ spring.redis.expire.time=30000
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.broker=tcp://172.16.10.215:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
mqtt.scene.host=mqtt://172.16.10.215:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 7f7958c5
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_amos_common_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url=jdbc:mysql://172.16.10.215:3306/dl_amos_common_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.11.201:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.215:10001/eureka/
spring.security.user.name=admin
spring.security.user.password=a1234560
## redis properties:danger/list
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.host=172.16.10.215
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=yeejoin@2020
## ES properties:
biz.elasticsearch.address=172.16.11.201
biz.elasticsearch.address=172.16.10.215
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= 123456
elasticsearch.password= Yeejoin@2020
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.broker=tcp://172.16.10.215:1883
emqx.user-name=admin
emqx.password=public
......
amos-boot-system-patrol/src/main/resources/application-dev.properties
View file @ 7f7958c5
eureka.client.serviceUrl.defaultZone=http://172.16.11.201:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.215:10001/eureka/
eureka.client.registry-fetch-interval-seconds=5
spring.security.user.name=admin
spring.security.user.password=a1234560
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
......@@ -18,7 +20,7 @@ ribbon.MaxAutoRetries = 1
xiy_amos_satety_business
spring.reactor.debug-agent.enabled=true
#DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url=jdbc:mysql://172.16.10.215:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.driver-class-name = com.mysql.jdbc.Driver
......@@ -35,9 +37,9 @@ security.appKey=studio_normalapp_3168830
#redis 配置
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.host=172.16.10.215
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=yeejoin@2020
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......@@ -68,13 +70,13 @@ emq.patrol.sync.switch=true
params.work.flow.normalProcessDefinitionKey=normalHazardManagement
params.work.flow.processDefinitionKey=hazardManagement
params.work.flow.address=http://172.16.11.201:30040
params.work.flow.address=http://172.16.10.215:30040
params.spc.address=http://172.16.3.89:9001
#websocket
params.remoteWebsocketUrl=http://172.16.11.201:8080/
params.remoteWebsocketUrl=http://172.16.10.215:8080/
#websocket send message url
params.remoteWebSocketSendMsgUrl=http://172.16.11.201:10601/
params.remoteWebSocketSendMsgUrl=http://172.16.10.215:10601/
#上传文件配置
spring.http.multipart.maxFileSize = 80480000
......@@ -85,7 +87,7 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-3578
emqx.broker=tcp://172.16.11.201:1883
emqx.broker=tcp://172.16.10.215:1883
emqx.user-name=admin
emqx.password=public
emqx.max-inflight=1000
......
amos-boot-system-patrol/src/main/resources/db/mapper/routePointItemMapper.xml
View file @ 7f7958c5
......@@ -58,4 +58,27 @@
point_id = #{pointId}
)
</delete>
<insert id="insertRoutePointItem">
insert into `p_route_point_item`
(`id`, `route_point_id`, `order_no`, `point_input_item_id`, `creator_id`, `create_date`, `point_classify_id`, `basis_json`)
VALUES(
#{id},
#{route_point_id},
#{order_no},
#{point_input_item_id},
#{creator_id},
#{create_date},
#{point_classify_id},
#{basis_json})
</insert>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment