Commit cd91d73c authored by 曹盼盼's avatar 曹盼盼

修改tzs

parent 0effeb67
...@@ -83,7 +83,8 @@ public class ControllerAop { ...@@ -83,7 +83,8 @@ public class ControllerAop {
// 不需要添加请求头的接口 // 不需要添加请求头的接口
String[] url = new String[] { "/api/user/save/curCompany", "/jcs/command/lookHtmlText", String[] url = new String[] { "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
"/openapi/bizToken/applyToken" "/openapi/bizToken/applyToken","/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/management-unit/tree","/tzs/flc-unit-info/region/tree", "/tzs/reg-unit-info/unit-type/list"
}; };
// 获取请求路径 // 获取请求路径
......
...@@ -116,7 +116,6 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da ...@@ -116,7 +116,6 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
data.setCount(num); data.setCount(num);
} }
return list; return list;
} }
@Override @Override
public List<DataDictionary> getByType(String type) { public List<DataDictionary> getByType(String type) {
......
<?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>
...@@ -124,7 +124,8 @@ public class RegUnitInfoController extends BaseController { ...@@ -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") @GetMapping(value = "/unit-type/list")
@ApiOperation(httpMethod = "GET", value = "单位类型列表", notes = "单位类型列表") @ApiOperation(httpMethod = "GET", value = "单位类型列表", notes = "单位类型列表")
public ResponseModel<List<DataDictionary>> unitTypeList() { public ResponseModel<List<DataDictionary>> unitTypeList() {
...@@ -133,7 +134,8 @@ public class RegUnitInfoController extends BaseController { ...@@ -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") @GetMapping(value = "/management-unit/tree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树") @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false)String orgCode) { public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false)String orgCode) {
......
...@@ -97,7 +97,8 @@ public class UnitInfoController extends BaseController { ...@@ -97,7 +97,8 @@ public class UnitInfoController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) //@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
@GetMapping(value = "/region/tree") @GetMapping(value = "/region/tree")
@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树") @ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) { public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) {
......
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