修改消息接口

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Msg.java

@@ -111,6 +111,36 @@ public class Msg extends BasicEntity{
 	@Column(name="create_by")
 	private Long createBy;
 
+
+	//单位code
+	@Column(name = "biz_org_code")
+	private String bizOrgCode;
+
+	public String getBizOrgCode() {
+		return bizOrgCode;
+	}
+
+	public void setBizOrgCode(String bizOrgCode) {
+		this.bizOrgCode = bizOrgCode;
+	}
+
+	public String getBizOrgName() {
+		return bizOrgName;
+	}
+
+	public void setBizOrgName(String bizOrgName) {
+		this.bizOrgName = bizOrgName;
+	}
+
+	//单位名称
+	@Column(name = "biz_org_name")
+	private String bizOrgName;
+
+
+
+
+
+
 	public String getTitle() {
 		return title;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/MsgController.java

@@ -86,6 +86,69 @@ public class MsgController extends AbstractBaseController {
 	private IUserService iUserService;
 	*/
 
+
+	/**
+	 * 新接口
+	 *
+	 * **/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "根据条件获取消息列表", notes = "APP 根据条件获取消息列表")
+	@PostMapping(value = "/listNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse querylistNew(
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) MsgInfoPageParam param,
+			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
+		try {
+
+			Page<MsgVo> dataList = iMsgService.queryMsgInfoList(param);
+			return CommonResponseUtil.success(dataList);
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			return CommonResponseUtil.failure("件获取消息列表失败");
+		}
+	}
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "通知发布", notes = "通知发布")
+	@PostMapping(value = "/noticePublishNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse noticePublishNew(@ApiParam(value = "通知信息", required = true) @RequestBody NoticePublishParam msg) {
+		try {
+			AgencyUserModel user = getUserInfo();
+			msg.setCreateBy(user.getUserId());
+			ReginParams reginParams = getSelectedOrgInfo();
+			msg.setUserName(user.getRealName());
+			String loginOrgCode = getOrgCode(reginParams);
+			msg.setOrgCode(loginOrgCode);
+			List<Msg> msgList = iMsgService.publishNotice(getToken(),getProduct(),getAppKey(),msg);
+			msgList.forEach(m->{
+				jobService.msgAddJob(m);
+			});
+
+			return CommonResponseUtil.success();
+		} catch (Exception e) {
+			return CommonResponseUtil.failure("通知发布失败！");
+		}
+	}
+
+
+
+	/**
+	 * 新接口
+	 *
+	 * **/
+
+
+
+
+
+
+
+
+
+
+
+	
 	/**
 	 * 获取用户当前所选择公司的消息订阅信息
 	 * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/MsgInfoPageParam.java

@@ -35,6 +35,30 @@ public class MsgInfoPageParam extends CommonPageable{
 	 */
 	private String userId;
 
+
+
+	/**
+	 * biz_org_code
+	 */
+	private String bizOrgCode;
+	private String bizOrgName;
+
+	public String getBizOrgName() {
+		return bizOrgName;
+	}
+
+	public void setBizOrgName(String bizOrgName) {
+		this.bizOrgName = bizOrgName;
+	}
+
+	public String getBizOrgCode() {
+		return bizOrgCode;
+	}
+
+	public void setBizOrgCode(String bizOrgCode) {
+		this.bizOrgCode = bizOrgCode;
+	}
+
 	public String getUserId() {
 		return userId;
 	}

amos-boot-system-patrol/src/main/resources/db/mapper/msgMapper.xml

@@ -213,6 +213,8 @@
 		  <if test="msgType != null">AND m.msg_type = #{msgType}</if>
           <if test="beginDate != null">AND m.create_date <![CDATA[>=]]> #{beginDate}</if>
           <if test="endDate != null">AND m.create_date <![CDATA[<=]]> #{endDate}</if>
+          <if test="bizOrgCode != null">AND m.biz_org_code = #{bizOrgCode}</if>
+
 		</where>
     </select>
 
@@ -239,6 +241,7 @@
           <if test="msgType != null">AND m.msg_type = #{msgType}</if>
           <if test="beginDate != null">AND m.create_date <![CDATA[>=]]> #{beginDate}</if>
           <if test="endDate != null">AND m.create_date <![CDATA[<=]]> #{endDate}</if>
+			<if test="bizOrgCode != null">AND m.biz_org_code = #{bizOrgCode}</if>
         </where>
         ORDER BY m.id DESC
         <choose>