feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.4</version>
+	<version>1.0.7</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -46,7 +46,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
 
 	})
-	@RequestMapping(value = "/tels",method = RequestMethod.GET)
+	@RequestMapping(value = "/admin/announcement-tels",method = RequestMethod.GET)
 	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
                                 @RequestParam(value = "tel", required = false) String tel,
                                 @RequestParam(value = "remark", required = false) String remark,
@@ -68,7 +68,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(dataTypeClass = String.class, paramType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
 
 	})
-	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
+	@RequestMapping(value = "/admin/announcement-tel/add",method = RequestMethod.POST)
 	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
 
@@ -106,7 +106,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
 
 	})
-	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
+	@RequestMapping(value = "/admin/announcement-tel/update", method = RequestMethod.PUT)
 	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		boolean isPhone = true;
@@ -126,28 +126,14 @@ public class AnnouncementTelController extends BaseController {
 //			return responseBean;
 //		}
 		TaUser userElement = getTaUser(request);
-		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
-		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
-		announcementTelQueryWrapper.eq("org_id", userElement.getOrgId());
-		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
-		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
+		AnnouncementTel telServiceOne = announcementTelService.getById(announcementTel.getId());
+		if (null != telServiceOne) {
 			announcementTel.setUpdateUser(userElement.getUserId());
 			announcementTel.setUpdateDate(LocalDateTime.now());
 			announcementTelService.updateById(announcementTel);
 			responseBean.addSuccess("修改物业端号码成功");
 			return responseBean;
 		}
-		if (null != telServiceOne) {
-			responseBean.addError("此号码已存在");
-			return responseBean;
-		}
-		announcementTel.setUpdateUser(userElement.getUserId());
-		announcementTel.setUpdateDate(LocalDateTime.now());
-		boolean state = announcementTelService.updateById(announcementTel);
-		if (state){
-			responseBean.addSuccess("修改物业端号码成功");
-			return responseBean;
-		}
 		responseBean.addError("修改物业端号码失败");
 		return responseBean;
 	}
@@ -157,7 +143,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
 
 	})
-	@RequestMapping(value = "/tel/{id}",method = RequestMethod.GET)
+	@RequestMapping(value = "/admin/announcement-tel/{id}",method = RequestMethod.GET)
 	public ResponseBean getNoticeById(@PathVariable(value ="id") Integer id, HttpServletRequest request){
 		ResponseBean responseBean = new ResponseBean();
 		AnnouncementTel announcementTel = announcementTelService.getById(id);
@@ -170,7 +156,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "body", dataType = "integer", name = "ids", value = "主键Id"),
 
 	})
-	@RequestMapping(value = "/tel/delete", method = RequestMethod.POST)
+	@RequestMapping(value = "/admin/announcement-tel/delete", method = RequestMethod.POST)
 	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		boolean state = announcementTelService.removeByIds(ids);

src/main/java/com/huiju/estateagents/property/controller/SocialController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpActivity;
@@ -39,11 +40,11 @@ public class SocialController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "orgId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
     public ResponseBean findAnnouncementDetail(@PathVariable(value = "orgId") Integer orgId, @RequestParam("id") Integer id, HttpServletRequest request) {
-        TaUser userElement = getTaUser(request);
-        Integer userId = userElement.getUserId();
+//        TaUser userElement = getTaUser(request);
+//        Integer userId = userElement.getUserId();
         ResponseBean responseBean = new ResponseBean();
 
-        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, orgId, userId);
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, orgId, getPersonId(request));
         responseBean.addSuccess(tpAnnouncement);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/model/TpSocialView.java

@@ -14,7 +14,7 @@ public class TpSocialView {
 
     private String socialType;
 
-    private Integer taUserId;
+    private String taUserId;
 
     private String remark;
 

src/main/java/com/huiju/estateagents/property/service/SocialServiceI.java

@@ -25,7 +25,7 @@ public interface SocialServiceI {
 	 * @param userId
 	 * @return
 	 */
-    TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, Integer userId);
+    TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, String personId);
 
 
 	/**

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -60,9 +60,9 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     @Transactional
-    public TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, Integer userId) {
+    public TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, String personId) {
         //更新此用户的查看次数操作
-        Integer allViewNum = updateSocialView(userId, Constant.ANNOUNCEMENT, orgId, id);
+        Integer allViewNum = updateSocialView(personId, Constant.ANNOUNCEMENT, orgId, id);
         if (null != allViewNum) {
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
@@ -142,10 +142,10 @@ public class SocialServiceImpl implements SocialServiceI {
      * @param orgId
      * @param uuid
      */
-    private Integer updateSocialView(Integer userId, String socialType, Integer orgId, Integer uuid) {
+    private Integer updateSocialView(String personId, String socialType, Integer orgId, Integer uuid) {
         //检查是否查看过这个帖子
         TpSocialView tpSocialView = new TpSocialView();
-        tpSocialView.setTaUserId(userId);
+        tpSocialView.setTaUserId(personId);
         tpSocialView.setSocialType(socialType);
         tpSocialView.setOrgId(orgId);
         tpSocialView.setUuid(uuid);

src/main/resources/mapper/property/AnnouncementTelMapper.xml

@@ -2,20 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.AnnouncementTelMapper">
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.AnnouncementTel">
-       SELECT
-            t.id,
-            t.org_id AS orgId,
-            t.NAME,
-            t.tel,
-            t.remark,
-            t.update_date,
-            u.user_name AS updateName
+       SELECT t.*
         FROM
             tp_announcement_tel t
-            LEFT JOIN tp_user u ON t.update_user = u.id
-        WHERE
-            1 = 1
-        AND t.org_id = #{announcementTel.orgId}
+        WHERE t.org_id = #{announcementTel.orgId}
         <if test="announcementTel.tel != null and announcementTel.tel != ''">
           AND t.tel like concat('%',#{announcementTel.tel},'%')
         </if>
@@ -25,5 +15,6 @@
         <if test="announcementTel.name != null and announcementTel.name != ''">
           AND t.name like concat('%',#{announcementTel.name},'%')
         </if>
+        ORDER BY t.create_date desc
     </select>
 </mapper>