Browse Source

Merge remote-tracking branch 'remotes/origin/dev' into release

master
jianjun 5 years ago
parent
commit
ec4ee3207e
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 1
      epmet-auth/src/main/java/com/epmet/controller/LoginController.java
  4. 7
      epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
  5. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
  6. 2
      epmet-module/data-report/data-report-server/pom.xml
  7. 8
      epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
  8. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java
  9. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  10. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  11. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  12. 151
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  13. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  14. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  15. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
  16. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.31
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.34
ports:
- "8081:8081"
network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.31</version>
<version>0.3.34</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

1
epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@ -108,7 +108,6 @@ public class LoginController {
**/
@PostMapping("getresiwxphone")
public Result getResiWxPhone(@RequestBody ResiWxPhoneFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class);
String phone = loginService.getResiWxPhone(formDTO);
if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) {
return new Result().ok(phone);

7
epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@ -12,6 +12,7 @@ import com.epmet.commons.tools.security.password.PasswordUtils;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.UserDTO;
import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.form.*;
@ -135,6 +136,7 @@ public class LoginServiceImpl implements LoginService {
public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) {
String phone="";
try {
ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class);
WxMaService wxMaService = wxMaServiceUtils.resiWxMaService();
WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode());
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(),
@ -145,7 +147,10 @@ public class LoginServiceImpl implements LoginService {
}
} catch (WxErrorException e) {
e.printStackTrace();
log.error(String.format("获取用户微信绑定的手机号接口异常"));
log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage()));
} catch(Exception e){
e.printStackTrace();
log.error(String.format("获取用户微信绑定的手机号接口异常%s",e.getMessage()));
}
return phone;
}

2
epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22
image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.23
ports:
- "8109:8109"
network_mode: host # 使用现有网络

2
epmet-module/data-report/data-report-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.22</version>
<version>0.3.23</version>
<artifactId>data-report-server</artifactId>
<parent>

8
epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@ -9,11 +9,11 @@
agency_id AS "agencyId",
project_total AS "projectTotal",
DATE_FORMAT(date_id, '%Y.%m.%d') AS "dateName",
pending_total AS "pendingTotal",
IFNULL(pending_total,0) AS "pendingTotal",
/*CAST(pending_ratio AS DECIMAL (9, 2)) AS "pendingRatioInt",*/
pending_ratio AS "pendingRatioInt",
closed_total AS "closedTotal",
closed_ratio AS "closedRatioInt"
IFNULL(pending_ratio,0) AS "pendingRatioInt",
IFNULL(closed_total,0) AS "closedTotal",
IFNULL(closed_ratio,0) AS "closedRatioInt"
FROM
fact_agency_project_daily
WHERE

2
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java

@ -29,7 +29,7 @@ public class ListCustomerGridFormDTO implements Serializable{
* 当前页
* */
@Min(value = 1)
private Integer pageNo;
private Integer pageNo = 1;
/**
* 每页显示数量

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.69
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.71
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.69</version>
<version>0.3.71</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -149,9 +149,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
//行政区 - 指定行政区在前,所属城市下其余行政区在后
Map<String,Object> map = new HashMap<>();
//地区码格式 六位 [abcxyz]
//ab代表省
//cx代表市
//yz代表区
map.put("areaCode",areaCode);
map.put("cityCode",areaCode.substring(0,areaCode.length()-NumConstant.FOUR));
map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
map.put("pageSize",listCustomerGridFormDTO.getPageSize());
map.put("pageNo",listCustomerGridFormDTO.getPageNo());

151
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -30,69 +30,120 @@
<!-- 根据城市地区码前四位匹配到城市下所有网格 -->
<select id="selectGridByCityLike" parameterType="com.epmet.dto.form.ListCustomerGridFormDTO" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
SELECT
id AS grid_id,
customer_id,
grid_name
grid.id AS grid_id,
grid.customer_id,
concat( agency.fullname, '-', grid.grid_name ) AS gridName
FROM
CUSTOMER_GRID grid
LEFT JOIN (
SELECT
a1.id,
CASE
WHEN a2.ORGANIZATION_NAME IS NULL THEN
a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
END AS fullname
FROM
customer_agency a1
LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
AND a1.del_flag = '0'
WHERE
a1.del_flag = '0'
) agency ON grid.PID = agency.ID
WHERE
grid.del_flag = 0
AND
grid.area_code LIKE CONCAT(#{areaCode},'%')
ORDER BY
grid.customer_id,
CONVERT ( gridName USING gbk ) ASC
LIMIT #{pageNo}, #{pageSize}
</select>
<!-- 根据区县地区码匹配到该地区置顶其余区域在后这种特定排序的数据集 -->
<select id="selectRestGridWithoutGivenAreaCode" parameterType="map" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
SELECT c.*
FROM
CUSTOMER_GRID
(
(
SELECT
a.id AS grid_id,
a.customer_id,
concat( agency.fullname, '-', a.grid_name ) AS gridName
FROM
CUSTOMER_GRID a
LEFT JOIN (
SELECT
a1.id,
CASE
WHEN a2.ORGANIZATION_NAME IS NULL THEN
a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
END AS fullname
FROM
customer_agency a1
LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
AND a1.del_flag = '0'
WHERE
a1.del_flag = '0'
) agency ON a.PID = agency.ID
WHERE
del_flag = 0
a.del_flag = 0
AND
area_code LIKE CONCAT(#{areaCode},'%')
a.area_code = #{areaCode}
ORDER BY
customer_id,
CONVERT ( grid_name USING gbk ) ASC
CONVERT ( gridName USING gbk ) ASC
LIMIT 0,999999999999
LIMIT #{pageNo}, #{pageSize}
</select>
)
<!-- 根据区县地区码匹配到该地区置顶其余区域在后这种特定排序的数据集 -->
<select id="selectRestGridWithoutGivenAreaCode" parameterType="map" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
UNION
(
SELECT
b.id AS grid_id,
b.customer_id,
concat(agency.fullname , '-' ,b.grid_name) as gridName
FROM
CUSTOMER_GRID b
SELECT c.*
LEFT JOIN (
SELECT
a1.id,
CASE
WHEN a2.ORGANIZATION_NAME IS NULL THEN
a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
END AS fullname
FROM
(
(
SELECT
a.id AS grid_id,
a.customer_id,
a.grid_name
FROM
CUSTOMER_GRID a
WHERE
a.del_flag = 0
AND
a.area_code = #{areaCode}
ORDER BY
CONVERT ( a.grid_name USING gbk ) ASC
)
UNION
(
SELECT
b.id AS grid_id,
b.customer_id,
b.grid_name
FROM
CUSTOMER_GRID b
WHERE
b.del_flag = 0
AND
b.area_code LIKE CONCAT(#{cityCode},'%')
AND <![CDATA[ b.area_code <> #{areaCode}
customer_agency a1
LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
AND a1.del_flag = '0'
WHERE
a1.del_flag = '0'
) agency ON b.PID = agency.ID
WHERE
b.del_flag = 0
AND
b.area_code LIKE CONCAT(#{cityCode},'%')
AND <![CDATA[ b.area_code <> #{areaCode}
]]>
ORDER BY
CONVERT ( b.grid_name USING gbk ) ASC
ORDER BY
b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
LIMIT 0,999999999999
)
) AS c
)
) AS c
LIMIT #{pageNo}, #{pageSize}
</select>

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.34
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.35
ports:
- "8102:8102"
network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.34</version>
<version>0.3.35</version>
<parent>
<artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@ -253,7 +253,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
agencyDeptGrid.getAgencyList().forEach(agency->{
if (ts.getAgencyId().equals(agency.getId())) {
entity.setCustomerId(agency.getCustomerId());
entity.setOrgIdPath(agency.getPids()+":"+agency.getId());
entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId());
entity.setDepartmentName(agency.getOrganizationName());
}
});

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -579,7 +579,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
agencyDeptGrid.getAgencyList().forEach(agency -> {
if (ts.getAgencyId().equals(agency.getId())) {
entity.setCustomerId(agency.getCustomerId());
entity.setOrgIdPath(agency.getPids() + ":" + agency.getId());
entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId());
entity.setDepartmentName(agency.getOrganizationName());
}
});

Loading…
Cancel
Save