Skip to content

A
amos-boot-biz
Commit 3524c930 authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents 7e531288 e6700975
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 471 additions and 159 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 3524c930
......@@ -84,8 +84,15 @@ public class ControllerAop {
String[] url = new String[] { "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
"/openapi/bizToken/applyToken"
//+ ",/tzs/reg-unit-info/management-unit/tree","/tzs/flc-unit-info/region/tree", "/tzs/reg-unit-info/unit-type/list"
};
,"/tzs/flc-unit-info/region/tree"
// ,"/tzs/reg-unit-info/management-unit/tree",
//"/tzs/reg-unit-info/unit-type/list"
+ "/tzs/reg-unit-info/management-unit/tree","/tzs/flc-unit-info/region/tree", "/tzs/reg-unit-info/unit-type/list"
,"/tzs/reg-unit-info/"+"^[A-Za-z0-9]+$"+"/check","/tzs/flc-unit-info/hasExistPhone","/tzs/flc-unit-info/sendTelCode"
};
// if (request.getRequestURI().contains("/tzs/reg-unit-info") || request.getRequestURI().contains("/tzs/flc-unit-info")) {
// return;
// }
// 获取请求路径
for (String uri : url) {
if (request.getRequestURI().indexOf(uri) != -1) {
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java
View file @ 3524c930
......@@ -116,7 +116,6 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
data.setCount(num);
}
return list;
}
@Override
public List<DataDictionary> getByType(String type) {
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java
View file @ 3524c930
......@@ -14,7 +14,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
@FeignClient(name = "TZS-tym", path = "/tzs", configuration =
@FeignClient(name = "TZS", path = "/tzs", configuration =
{MultipartSupportConfig.class})
public interface TzsServiceFeignClient {
......
amos-boot-data/amos-boot-data-openapi/src/main/resources/mapper/ViewJgClaimMapper.xml deleted 100644 → 0
View file @ 7e531288
<?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.yeejoin.amos.api.openapi.face.orm.dao.EquipmentMapper">
<!-- <select id="page"
resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentModel">
SELECT
supervise.sequence_nbr,
registration.use_org_code AS useRegistrationNumber,
use1.use_unit_name AS useUnit,
registration.equ_list AS equipmentType,
registration.equ_category AS equipmentCategory,
registration.equ_define AS equipmentVariety,
registration.product_name AS equipmentName,
registration.equ_code AS equipmentCode,
registration.sequence_code AS equipmentNumber,
use1.use_inner_code AS internalNumber,
registration.organization_name AS registrationOrgan,
NULL AS registrationDate,
CONCAT(use1.province,use1.city,use1.county,use1.street,use1.address)AS useUnitAddress,
use1.use_unit_credit_code AS useUnitCode,
use1.area_code AS useUnitAreaCode,
use1.equ_state AS regStatus,
use1.use_state_change_date AS useStatusUpdate,
use1.changes AS changeStatus,
use1.use_state_change_date AS changeUpdate,
use1.use_date AS useDate,
design.design_unit_name AS designUnitName,
maintenance.me_unit_name AS manUnitName,
(SELECT construct.usc_unit_name FROM tz_jg_construction_info construct WHERE construct.sequence_code = supervise.sequence_code ORDER BY construct.sync_date DESC LIMIT 1) AS builderUnitName,
NULL AS JDUnitName,
NULL AS XSUnitName,
produce.produce_unit_name AS CQUnitName,
produce.produce_unit_credit_code AS CQUnitCode,
supervise.sync_date AS recordDate
FROM tz_jg_supervise_info supervise
LEFT JOIN
tz_jg_use_info use1 ON use1.sequence_code =
supervise.sequence_code
LEFT JOIN tz_jg_maintenance_info maintenance ON
maintenance.sequence_code
= supervise.sequence_code
LEFT JOIN
tz_jg_registration_info registration ON
registration.sequence_code =
supervise.sequence_code
LEFT JOIN tz_jg_other_info other ON
other.sequence_code =
supervise.sequence_code
LEFT JOIN
tz_jg_produce_info produce ON produce.sequence_code =
supervise.sequence_code
LEFT JOIN
tz_jg_design_info design ON design.sequence_code =
supervise.sequence_code
<where>
<if
test="startTime !=null and endTime !=null">
supervise.sync_date BETWEEN #{startTime} AND #{endTime}
OR use1.sync_date BETWEEN #{startTime} AND #{endTime}
OR maintenance.sync_date BETWEEN #{startTime} AND #{endTime}
OR registration.sync_date BETWEEN #{startTime} AND #{endTime}
OR other.sync_date BETWEEN #{startTime} AND #{endTime}
OR produce.sync_date BETWEEN #{startTime} AND #{endTime}
OR design.sync_date BETWEEN #{startTime} AND #{endTime}
OR (SELECT construct.sync_date FROM tz_jg_construction_info construct WHERE construct.sequence_code = supervise.sequence_code ORDER BY construct.sync_date DESC LIMIT 1) BETWEEN #{startTime} AND #{endTime}
</if>
</where>
</select> -->
<select id="page"
resultType="com.yeejoin.amos.api.openapi.face.model.EquipmentModel">
SELECT
*
FROM
tm_equipment_info
<where>
<if
test="startTime !=null and endTime !=null">
record_date BETWEEN #{startTime} AND #{endTime}
</if>
</where>
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @ 3524c930
......@@ -18,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -53,6 +54,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
//人员教育信息
@Autowired
PersonSkillEducationServiceImpl personSkillEducationService;
@Value("${amos.secret.key}")
String secretKey;
/**
* 分页查询
......@@ -118,9 +121,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
}
usd.setOrgRoleSeqs(map);
//密码
usd.setPassword(DesUtil.encode(personAccount.getPassword(), "qaz"));
usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
//二次密码
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
//用户名
usd.setRealName(personAccount.getName());
//账号
......@@ -143,17 +146,19 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
//单位
companyModel = this.getCompanyModel(personAccount.getProjectId());
if (departmentModel != null) {
personBasic.setProjectOrgCode(departmentModel.getOrgCode());
//personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
} else {
personBasic.setProjectOrgCode(companyModel.getOrgCode());
}
personBasic.setProjectOrgCode(companyModel.getOrgCode());
if (personUser.getNativePlace()!=null) {
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
}
personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectName(companyModel.getCompanyName());
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
this.personBasicMapper.updateById(personBasic);
this.personAccountService.updateById(personAccount);
}
......@@ -205,9 +210,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
}
usd.setOrgRoleSeqs(map);
//密码
usd.setPassword(DesUtil.encode(personAccount.getPassword(), "qaz"));
usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
//二次密码
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
//用户名
usd.setRealName(personAccount.getName());
//账号
......@@ -233,15 +238,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
BeanUtils.copyProperties(personUser, personBasic);
if (departmentModel != null) {
personBasic.setProjectOrgCode(departmentModel.getOrgCode());
//personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
} else {
personBasic.setProjectOrgCode(companyModel.getOrgCode());
}
personBasic.setProjectOrgCode(companyModel.getOrgCode());
if (personUser.getNativePlace() != null) {
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
}
personAccount.setProjectName(companyModel.getCompanyName());
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
this.personBasicMapper.updateById(personBasic);
personAccountService.updateById(personAccount);
return model;
......@@ -275,6 +282,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
//人员账号信息
PersonAccount personAccount = personAccountService.getOne(wrapper4);
personAccount.setPhoneNum(personBasic.getPhone());
//对于密码进行解密
personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
if (personBasic.getNativePlace() != null) {
personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
}
......@@ -418,5 +428,4 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
return page;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application-dev.properties
View file @ 3524c930
......@@ -72,3 +72,9 @@ spring.security.user.password=a1234560
fire-rescue=123
mybatis-plus.global-config.db-config.update-strategy=ignored
# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
amos.secret.key=qaz
# if your service can't be access ,you can use this setting , you need change ip as your.
#eureka.instance.prefer-ip-address=true
#eureka.instance.ip-address=172.16.3.122
\ No newline at end of file
amos-boot-system-knowledgebase/src/main/resources/mapper/MessageMapper.xml 0 → 100644
View file @ 3524c930
<?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.yeejoin.amos.knowledgebase.face.orm.dao.MessageMapper">
<select id="selectMessageListByOwner" parameterType="string" resultType="map">
SELECT
km.rec_user_id AS sponsor,
km.rec_date AS starttingTime,
km.message_type AS messageType,
km.message_title AS messageTitle,
km.message_content AS messageContent,
km.target_seq AS targetSeq,
kmp.message_owner AS owner,
kmp.message_status AS messageStatus,
kmp.sequence_nbr AS sequenceNbr
FROM
knowledge_message_personal kmp
LEFT JOIN knowledge_message km
ON kmp.message_seq = km.sequence_nbr
where kmp.message_owner = #{owner}
<if test="messageType!=null and messageType.length!=0">
and km.message_type = #{messageType}
</if>
ORDER BY
kmp.message_status ASC,
km.rec_date DESC
</select>
<select id="selectMessageBySeq" parameterType="long" resultType="map">
SELECT
km.rec_user_id AS sponsor,
km.rec_date AS starttingTime,
km.message_type AS messageType,
km.message_title AS messageTitle,
km.message_content AS messageContent,
km.target_seq AS targetSeq,
kmp.message_owner AS owner,
kmp.message_status AS messageStatus,
kmp.sequence_nbr AS sequenceNbr
FROM
knowledge_message_personal kmp
LEFT JOIN knowledge_message km
ON kmp.message_seq = km.sequence_nbr
where kmp.sequence_nbr = #{sequenceNbr}
</select>
<select id="selectMessageListByPage" parameterType="java.util.Map" resultType="map">
SELECT
km.rec_user_id AS sponsor,
km.rec_date AS starttingTime,
km.message_type AS messageType,
km.message_title AS messageTitle,
km.message_content AS messageContent,
km.target_seq AS targetSeq,
kmp.message_owner AS owner,
kmp.message_status AS messageStatus,
kmp.sequence_nbr AS sequenceNbr
FROM
knowledge_message_personal kmp
LEFT JOIN knowledge_message km
ON kmp.message_seq = km.sequence_nbr
where kmp.message_owner = #{owner}
<if test="messageType!=null and messageType.length!=0">
and km.message_type = #{messageType}
</if>
ORDER BY
kmp.message_status ASC,
km.rec_date DESC
LIMIT #{current},#{size}
</select>
<select id="selectMessageListByCount" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT
COUNT(*)
FROM
knowledge_message_personal kmp
LEFT JOIN knowledge_message km
ON kmp.message_seq = km.sequence_nbr
where kmp.message_owner = #{owner}
<if test="messageType!=null and messageType.length!=0">
and km.message_type = #{messageType}
</if>
ORDER BY
kmp.message_status ASC,
km.rec_date DESC
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ViewJgClaimMapper.java
View file @ 3524c930
......@@ -2,7 +2,12 @@ package com.yeejoin.amos.boot.module.tzs.api.mapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface ViewJgClaimMapper {
String supervisoryCode(String code);
List<Map<String, Object>> getDetialMapList(String record);
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEquipmentCategoryService.java
View file @ 3524c930
......@@ -32,4 +32,6 @@ public interface IEquipmentCategoryService {
List<CategoryOtherInfo> checkCode(Map<String,Object> obj);
List<String> updateOtherInfo(Map<String, Object> map);
Map<String,Map<String,Object>> getFormRecordById(Map<String, Object> map);
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IUserCheckStatusService.java
View file @ 3524c930
package com.yeejoin.amos.boot.module.tzs.api.service;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.tzs.api.entity.UserCheckStatus;
/**
......@@ -8,7 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.UserCheckStatus;
*/
public interface IUserCheckStatusService {
UserCheckStatus getUserCheckStatus(String useName);
UserCheckStatus getUserCheckStatus(ReginParams reginParams);
UserCheckStatus updateUserCheckStatus(String useName, String status);
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java
View file @ 3524c930
......@@ -29,4 +29,10 @@ public interface IdxFeignService {
* */
@RequestMapping(value = "/table/getPage", method = RequestMethod.GET)
ResponseModel<Page<Map<String,Object>>> getPage(@RequestParam Map map);
/**
*根据record查询表格数据详情
*/
@RequestMapping(value = "/report/form/getFormRecordById", method = RequestMethod.GET)
ResponseModel<Map<String,Map<String,Object>>>getFormRecordById(@RequestParam Map map);
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml
View file @ 3524c930
......@@ -280,13 +280,16 @@
d2.name AS cylinder_variety_name,
d3.name AS cylinder_status_str,
ct.qrCode,
ct.electronic_label_code
ct.electronic_label_code,
cu.region_code
FROM
tz_cylinder_info AS ci
LEFT JOIN cb_data_dictionary AS d1 ON d1.type = 'CZJZMC' AND d1.code = ci.filling_media
LEFT JOIN cb_data_dictionary AS d2 ON d2.sequence_nbr = ci.cylinder_variety
LEFT JOIN cb_data_dictionary AS d3 ON d3.sequence_nbr = ci.cylinder_status
LEFT JOIN tz_cylinder_tags AS ct ON ct.sequence_code = ci.sequence_code
LEFT JOIN tz_cylinder_unit AS cu ON ci.app_id = cu.app_id
where ci.is_not_es IS NULL
AND region_code is not null
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/ViewJgClaimMapper.xml
View file @ 3524c930
......@@ -7,6 +7,41 @@
SELECT "SEQUENCE_NBR" FROM idx_biz_view_jg_claim WHERE SUPERVISORY_CODE=#{code}
</select>
<select id="getDetialMapList" resultType="java.util.Map">
SELECT
SEQUENCE_NBR,
ORG_BRANCH_NAME,
ORG_BRANCH_CODE,
USE_UNIT_NAME,
REC_DATE,
USE_UNIT_CREDIT_CODE,
EQU_LIST_CODE,
EQU_LIST,
EQU_CATEGORY,
USE_ORG_CODE,
CODE96333,
EQU_CODE,
SUPERVISORY_CODE,
USE_PLACE,
ADDRESS,
EQU_STATE,
STATUS,
EDIT_STATUS
FROM idx_biz_view_jg_claim
<where>
<if test="record !=null and record != ''">
SEQUENCE_NBR =#{record}
</if>
</where>
</select>
</mapper>
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/AmosTzsApplication.java
View file @ 3524c930
......@@ -24,6 +24,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.typroject.tyboot.component.emq.EmqKeeper;
import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
import java.net.InetAddress;
import java.net.UnknownHostException;
......@@ -42,6 +43,7 @@ import java.net.UnknownHostException;
@EnableDiscoveryClient
@EnableFeignClients
@EnableAsync
@EnableSwagger2WebMvc
@EnableEurekaClient
@EnableScheduling
@MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java
View file @ 3524c930
......@@ -209,6 +209,18 @@ public class EquipmentCategoryController extends BaseController {
return ResponseHelper.buildResponse(equipmentCategoryService.updateOtherInfo(map));
}
/**
* 根据record查询表格数据详情
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getFormRecordById", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "表格查询详情", notes = "表格查询详情")
public ResponseModel<Object> getFormRecordById(@RequestParam Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.getFormRecordById(map));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码")
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsAppController.java
View file @ 3524c930
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.module.tzs.api.common.MobileLoginParam;
......@@ -63,12 +64,12 @@ public class TzsAppController {
private static final String JIANGUAN="/";
/**
* 获取设计信息
* 小程序获取设备详情
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipmentInfo")
@ApiOperation(httpMethod = "GET", value = "获取设计信息", notes = "获取设计信息")
@ApiOperation(httpMethod = "GET", value = "小程序获取设备详情", notes = "小程序获取设备详情")
public ResponseModel<Object> getEquipmentInfo(String record) {
return ResponseHelper.buildResponse(appService.getEquipmentInfo(record));
}
......@@ -207,5 +208,13 @@ public class TzsAppController {
return ResponseHelper.buildResponse(appService.equipmentCount(unitCode));
}
//设备列表
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "设备列表", notes = "设备列表")
@GetMapping(value = "/getTable")
public ResponseModel<Page<Map<String,Object>>> getTable(@RequestParam Map<String,Object> map) {
return ResponseHelper.buildResponse(appService.getTable(map));
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/UserCheckStatusController.java
View file @ 3524c930
......@@ -46,8 +46,7 @@ public class UserCheckStatusController extends BaseController {
if (ObjectUtils.isEmpty(reginParams)) {
return null;
}
String useName = reginParams.getUserModel().getUserName();
return ResponseHelper.buildResponse(userCheckStatusService.getUserCheckStatus(useName));
return ResponseHelper.buildResponse(userCheckStatusService.getUserCheckStatus(reginParams));
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 3524c930
......@@ -28,7 +28,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -55,6 +57,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
private Resource equipCategory;
@Autowired
private JdbcTemplate bizJdbcTemplate;
@Autowired
CategoryOtherInfoMapper categoryOtherInfoMapper;
@Autowired
......@@ -65,6 +70,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Autowired
IdxFeignService idxFeignService;
@Autowired
private static final String TABLENAME="tableName";
@Value("${regulator.unit.code}")
private String code;
......@@ -80,8 +88,11 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
private static final String XIAN = "610100";
//判断行政区划查询市还是区
private static final String END_CODE = "0000";
//一码通监督管理表单id
private static final String SUPERVISION_FROM_ID = "1627903532906602497";
//一码通复制功能url参数key
private static final String COPY_KEY = "stashType";
/**
* 分页查询
*/
......@@ -526,7 +537,10 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
public List<JSONObject> getCompanyType() {
ResponseModel<AgencyUserModel> me = privilegeFeginService.getMe();
List<CompanyModel> companys = me.getResult().getCompanys();
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<CompanyModel> companys = reginParams.getUserModel().getCompanys();
List<JSONObject> objectList = new ArrayList<>();
for (CompanyModel company : companys) {
JSONObject object = new JSONObject();
......@@ -539,6 +553,70 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
}
@Override
public Map<String, Map<String, Object>> getFormRecordById(Map<String, Object> map) {
ResponseModel<Map<String, Map<String, Object>>> responseModel = idxFeignService.getFormRecordById(map);
Map<String, Map<String, Object>> result = responseModel.getResult();
if (!ObjectUtils.isEmpty(map.get(COPY_KEY))) {
result.get(SUPERVISION_FROM_ID).remove("CLAIM_STATUS");
result.get(SUPERVISION_FROM_ID).remove("CODE96333");
result.get(SUPERVISION_FROM_ID).remove("SUPERVISORY_CODE");
}
return result;
}
/**
* 分页查询数据
*/
public Page<Map<String, Object>> getPage(Map<String, Object> map) {
String tableName = map.get(TABLENAME).toString();
Object sort = map.get("sort");
Integer number = ValidationUtil.isEmpty(map.get("number")) ? 0 : Integer.valueOf(map.get("number").toString());
Integer size = ValidationUtil.isEmpty(map.get("size")) ? 0 : Integer.valueOf(map.get("size").toString());
Page<Map<String, Object>> page = new Page<>(number, size);
Assert.hasText(tableName, "表名不能为空");
String selectSql = "SELECT * FROM " + tableName;
String countSql = " SELECT COUNT(*) count FROM " + tableName;
StringJoiner andJoiner = new StringJoiner(" AND ");
for (Map.Entry<String, Object> entry : map.entrySet()) {
if (!(entry.getKey().equals("tableName") || entry.getKey().equals("number") || entry.getKey().equals("size") || entry.getKey().equals("sort")) && !ValidationUtil.isEmpty(entry.getValue())) {
if (!ValidationUtil.isEmpty(entry.getValue()) && entry.getValue().toString().contains("[") && entry.getValue().toString().contains("]")) {
String jsonValue = entry.getValue().toString().replace("[", "[\"").replace("]", "\"]").replaceAll(" ", "").replaceAll(",", "\",\"");
StringJoiner orJoiner = new StringJoiner(" or ");
// 兼容数据库存储String和list格式
JSON.parseArray(jsonValue).stream().forEach(x -> {
orJoiner.add(entry.getKey() + " like '%" + x + "%'");
});
andJoiner.add("(" + orJoiner + ")");
} else {
andJoiner.add(entry.getKey() + " like '%" + entry.getValue().toString() + "%'");
}
}
}
if (!ValidationUtil.isEmpty(andJoiner.toString())) {
selectSql = selectSql + " WHERE " + andJoiner;
countSql = countSql + " WHERE " + andJoiner;
}
if (!ValidationUtil.isEmpty(sort)) {
String[] split = sort.toString().split(",");
selectSql = selectSql + " ORDER BY " + split[0] + (split[1].equals("descend") ? " DESC " : " ASC ");
}
int begin = (number - 1) * size;
if (size > 0) {
selectSql += " LIMIT " + begin + "," + size;
}
Long count = bizJdbcTemplate.queryForObject(countSql, Long.class);
String finalSelectSql = selectSql;
List<Map<String, Object>> mapList = bizJdbcTemplate.queryForList(finalSelectSql);
page.setTotal(count);
page.setRecords(mapList);
return page;
}
/**
* levlel=company,是企业,如果不是都是监管单位,
* * 在接口中查询当前登录人所属单位是监管单位还是企业。
......@@ -562,21 +640,21 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
String code = object.getString("orgCode");
String companyCode = object.getString("companyCode");
if (!ValidationUtil.isEmpty(level)) {
ResponseModel<Page<Map<String, Object>>> m = new ResponseModel<>();
Page<Map<String, Object>> m = new Page<>();
if (LEVEL.equals(level)) {
//企业
map.put("USE_UNIT_CREDIT_CODE", companyCode);
m = idxFeignService.getPage(map);
m = this.getPage(map);
map.remove("USE_UNIT_CREDIT_CODE");
} else {
//监管单位
map.put("ORG_BRANCH_CODE", code);
m = idxFeignService.getPage(map);
m = this.getPage(map);
map.remove("ORG_BRANCH_CODE");
}
total += m.getResult().getTotal();
if (!ValidationUtil.isEmpty(m) && !ValidationUtil.isEmpty(m.getResult()) && !ValidationUtil.isEmpty(m.getResult().getRecords())) {
res.addAll(m.getResult().getRecords());
total += m.getTotal();
if (!ValidationUtil.isEmpty(m) && !ValidationUtil.isEmpty(m.getRecords())) {
res.addAll(m.getRecords());
}
}
}
......@@ -602,7 +680,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return mapPage;
}
private static final String TABLENAME = "tableName";
public List<Map<String, Object>> scalp(Map<String, Object> map) {
List<Map<String, Object>> list = new ArrayList<>();
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAppService.java
View file @ 3524c930
......@@ -18,9 +18,11 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.*;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.ViewJgClaimMapper;
import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitInfoMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
......@@ -46,6 +48,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
......@@ -68,9 +71,14 @@ public class TzsAppService {
DesignInfoService designInfoService;
@Autowired
IdxFeignService idxFeignService;
@Autowired
EquipmentCategoryMapper equipmentCategoryMapper;
@Autowired
EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
@Autowired
ProduceInfoService produceInfoService;
@Autowired
......@@ -124,8 +132,6 @@ public class TzsAppService {
@Autowired
OtherInfoService otherInfoService;
@Autowired
EquipmentCategoryServiceImpl equipmentCategoryServiceImpl;
@Autowired
CategoryOtherInfoMapper categoryOtherInfoMapper;
......@@ -146,6 +152,8 @@ public class TzsAppService {
String minioPath;
@Autowired
private RegUnitInfoMapper regUnitInfoMapper;
@Autowired
ViewJgClaimMapper viewJgClaimMapper;
public static final String WXUSER_TOKEN = "wxUser_token";
/**
......@@ -168,7 +176,8 @@ public class TzsAppService {
Map<String, Object> map = new HashMap();
map.put("SEQUENCE_NBR", record);
map.put("tableName", "idx_biz_view_jg_claim");
List<Map<String, Object>> detialMapList = equipmentCategoryServiceImpl.getTable(map).getRecords();
ResponseModel<Page<Map<String, Object>>> model=idxFeignService.getPage(map);
List<Map<String, Object>> detialMapList = model.getResult().getRecords();
if (!ValidationUtil.isEmpty(detialMapList)) {
map = detialMapList.iterator().next();
}
......@@ -187,7 +196,7 @@ public class TzsAppService {
// 施工
JSONObject constructionJsonObject = new JSONObject();
List constructionList = new ArrayList();
getGroupList(record, ConstructionInfo.class, ConstructionInfoModel.class, constructionInfoService, constructionList, true);
getGroupList(record, ConstructionInfo.class, ConstructionInfoModel.class, constructionInfoService, constructionList, true);
constructionJsonObject.put("title", "施工");
constructionJsonObject.put("tabValue", constructionList);
jsonArray.add(constructionJsonObject);
......@@ -266,11 +275,17 @@ public class TzsAppService {
}
} else {
int count = entityList.size();
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
JSONObject result = getFieldList(dto, jsonObject, count);
list.add(result);
}
int count = entityList.size();
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
JSONObject result = getFieldList(dto, jsonObject, count);
list.add(result);
}
}
......@@ -317,7 +332,7 @@ public class TzsAppService {
JSONObject object = JSON.parseObject(JSON.toJSONString(obj));
if (!ValidationUtil.isEmpty(object)) {
object.getString("url");
object.put("url", minioPath + object.getString("url"));
object.put("url",object.getString("url"));
json.add(object);
}
}
......@@ -363,7 +378,7 @@ public class TzsAppService {
Map<String, String> map = date.getResult();
Iterator<String> it = map.keySet().iterator();
String urlString = it.next();
jsonObject.put("fileUrl", minioPath + urlString);
jsonObject.put("fileUrl", urlString);
jsonObject.put("fileName", code);
}
} catch (IOException e) {
......@@ -498,4 +513,16 @@ public class TzsAppService {
page.setRecords(list);
return page;
}
public Page<Map<String,Object>> getTable(Map<String, Object> map) {
Page<Map<String, Object>> table=null;
String teqy = (String)map.get("teqy");
if (ValidationUtil.isEmpty(teqy) ) {
table = equipmentCategoryServiceImpl.getTable(map);
}else {
map.remove("teqy");
table = idxFeignService.getPage(map).getResult();
}
return table;
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/UserCheckStatusServiceImpl.java
View file @ 3524c930
package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.tzs.api.dto.UserCheckStatusDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.UserCheckStatus;
import com.yeejoin.amos.boot.module.tzs.api.mapper.UserCheckStatusMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IUserCheckStatusService;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 装备分类服务实现类
*
......@@ -24,18 +30,34 @@ public class UserCheckStatusServiceImpl extends BaseService<UserCheckStatusDto,
@Autowired
UserCheckStatusMapper userCheckStatusMapper;
//使用单位sequence_nbr
private final Long USEUNITID = 1460532889249755137L;
@Override
public UserCheckStatus getUserCheckStatus(String useName) {
UserCheckStatus userCheckStatus = userCheckStatusMapper.selectOne(new QueryWrapper<UserCheckStatus>().eq("use_name", useName));
if (ObjectUtils.isEmpty(userCheckStatus)) {
UserCheckStatus checkStatus = new UserCheckStatus();
checkStatus.setUseName(useName);
checkStatus.setStatus("0");
int result = userCheckStatusMapper.insert(checkStatus);
if (result == 1) {
return userCheckStatus;
} else {
return null;
public UserCheckStatus getUserCheckStatus(ReginParams reginParams) {
UserCheckStatus userCheckStatus = new UserCheckStatus();
userCheckStatus.setStatus("1");
Map<Long, List<RoleModel>> orgRoles = reginParams.getUserModel().getOrgRoles();
if(!ObjectUtils.isEmpty(orgRoles)){
Set<Long> longs = orgRoles.keySet();
for (Long aLong : longs) {
for (RoleModel roleModel : orgRoles.get(aLong)) {
if(USEUNITID.equals(roleModel.getSequenceNbr())){
String useName = reginParams.getUserModel().getUserName();
userCheckStatus = userCheckStatusMapper.selectOne(new QueryWrapper<UserCheckStatus>().eq("use_name", useName));
if (ObjectUtils.isEmpty(userCheckStatus)) {
UserCheckStatus checkStatus = new UserCheckStatus();
checkStatus.setUseName(useName);
checkStatus.setStatus("0");
int result = userCheckStatusMapper.insert(checkStatus);
if (result == 1) {
return userCheckStatus;
} else {
return null;
}
}
}
}
}
}
return userCheckStatus;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java
View file @ 3524c930
......@@ -612,7 +612,7 @@ public class CylinderInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getEsCyinderInfoList")
@ApiOperation(httpMethod = "GET", value = "获取登陆人所在气瓶基本信息", notes = "获取登陆人所在气瓶基本信息")
public ResponseModel<IPage<ESCylinderInfoDto>> getEsCyinderInfoList(@RequestParam(value = "pageNum") int pageNum,
public ResponseModel<Page<ESCylinderInfoDto>> getEsCyinderInfoList(@RequestParam(value = "pageNum") int pageNum,
@RequestParam(value = "pageSize") int pageSize,
CylinderInfoDto cylinderInfoDto) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
......@@ -624,7 +624,7 @@ public class CylinderInfoController extends BaseController {
cylinderInfoDto.setCreditCode(companyCode);
}
if (ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode()) && cylinderInfoDto.getIsWarn() == 0) {
return null;
return ResponseHelper.buildResponse(new Page<ESCylinderInfoDto>());
}
Page<ESCylinderInfoDto> pageResult = cylinderInfoServiceImpl.queryByKeys(cylinderInfoDto, pageNum, pageSize);
return ResponseHelper.buildResponse(pageResult);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/RegUnitInfoController.java
View file @ 3524c930
......@@ -124,7 +124,8 @@ public class RegUnitInfoController extends BaseController {
}
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/unit-type/list")
@ApiOperation(httpMethod = "GET", value = "单位类型列表", notes = "单位类型列表")
public ResponseModel<List<DataDictionary>> unitTypeList() {
......@@ -133,7 +134,8 @@ public class RegUnitInfoController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
// @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
@GetMapping(value = "/management-unit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false)String orgCode) {
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java
View file @ 3524c930
......@@ -97,7 +97,8 @@ public class UnitInfoController extends BaseController {
*
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
//@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
@GetMapping(value = "/region/tree")
@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) {
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java
View file @ 3524c930
......@@ -11,16 +11,23 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderFillingRecord;
import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderFillingRecordMapper;
import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderFillingRecordService;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
......@@ -47,6 +54,18 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
@Autowired
CylinderFillingRecordMapper cylinderFillingRecordMapper;
@Value("${biz.elasticsearch.address}")
private String esAddress;
@Value("${biz.elasticsearch.port}")
private Integer esPort;
@Value("${elasticsearch.username}")
private String esUserName;
@Value("${elasticsearch.password}")
private String esPwd;
/**
* 分页查询
*/
......@@ -177,10 +196,25 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
Page<ESCylinderFillingRecordDto> result = new Page<ESCylinderFillingRecordDto>(pageNum, pageSize);
RestHighLevelClient esClient = new RestHighLevelClient(
RestClient.builder(new HttpHost("36.46.151.113", 9200, "http"))
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(esUserName, esPwd)); //es账号密码
RestHighLevelClient esClient =new RestHighLevelClient(
RestClient.builder(
new HttpHost(esAddress,esPort)
).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
})
);
// RestHighLevelClient esClient = new RestHighLevelClient(
// RestClient.builder(new HttpHost(esAddress, esPort, "http"))
// );
SearchRequest request = new SearchRequest();
request.indices("cylinder_info");
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @ 3524c930
......@@ -26,10 +26,16 @@ import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
......@@ -129,6 +135,19 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
@Value("${cylinder-early-warning-packageId:气瓶消息预警/cylwarningmsg}")
private String cylPackageId;
@Value("${biz.elasticsearch.address}")
private String esAddress;
@Value("${biz.elasticsearch.port}")
private Integer esPort;
@Value("${elasticsearch.username}")
private String esUserName;
@Value("${elasticsearch.password}")
private String esPwd;
@Autowired
StartPlatformTokenService startPlatformTokenService;
......@@ -709,11 +728,27 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
public Page<ESCylinderInfoDto> queryByKeys(CylinderInfoDto cylinderInfoDto, int pageNum, int pageSize) {
Page<ESCylinderInfoDto> result = new Page<ESCylinderInfoDto>(pageNum, pageSize);
RestHighLevelClient esClient = new RestHighLevelClient(
RestClient.builder(new HttpHost("36.46.151.113", 9200, "http"))
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(esUserName, esPwd)); //es账号密码
RestHighLevelClient esClient =new RestHighLevelClient(
RestClient.builder(
new HttpHost(esAddress,esPort)
).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
})
);
// RestHighLevelClient esClient = new RestHighLevelClient(
// RestClient.builder(new HttpHost(esAddress, esPort, "http"))
// );
SearchRequest request = new SearchRequest();
request.indices("cylinder_info");
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ 3524c930
......@@ -611,7 +611,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
.collect(Collectors.toList());
for (RoleModel roleModel : allRoleList.stream()
.filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())) {
.filter(r -> unitType.getExtend().contains(r.getSequenceNbr().toString())).collect(Collectors.toList())) {
userRoleList.add(roleModel);
}
userRoleList.forEach(r -> {
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev3.properties
View file @ 3524c930
......@@ -39,6 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.por
eureka.instance.ip-address = 172.16.3.34
## ES properties:
biz.elasticsearch.port=9200
biz.elasticsearch.address=36.46.151.113
spring.data.elasticsearch.cluster-name=docker-cluster
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/appApplyInfo.json
View file @ 3524c930
{
"appApplyInfo": [
{
"name": "城燃管道",
"appKey": "studio_normalapp_4403119",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
},
{
"name": "气瓶安全追溯系统",
"appKey": "studio_normalapp_3404491",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/appApplyInfobak.json 0 → 100644
View file @ 3524c930
{
"appApplyInfo": [
{
"name": "城燃管道",
"appKey": "studio_normalapp_4403119",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
},
{
"name": "气瓶安全追溯系统",
"appKey": "studio_normalapp_3404491",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
},
{
"name": "特种设备安全追溯",
"appKey": "studio_normalapp_4391091",
"image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
}
]
}
\ No newline at end of file
pom.xml
View file @ 3524c930
......@@ -294,24 +294,24 @@
<repository>
<id>Releases</id>
<name>Releases</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
<url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>com.e-iceblue</id>
<name>e-iceblue</name>
<url>https://repo.e-iceblue.com/nexus/content/groups/public/</url>
<url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
</repository>
<repository>
<id>Snapshots</id>
<name>Snapshots</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url>
<url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>thirdparty</id>
<name>thirdparty</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/thirdparty/</url>
<url>http://113.142.68.105:8081/nexus/content/repositories/thirdparty/</url>
</repository>
</repositories>
......
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