xiao547607 5 年之前
父節點
當前提交
10c95a3bb1

+ 2 - 1
src/main/java/com/jpsoft/smart/config/WebMvcConfig.java

@@ -54,6 +54,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/aliPay/tradePrecreatePay")
 				.excludePathPatterns("/aliPay/payNotify")
 				.excludePathPatterns("/wxPay/payNotify")
-				.excludePathPatterns("/base/alarmInfo/alarmNotify");
+				.excludePathPatterns("/base/alarmInfo/alarmNotify")
+				.excludePathPatterns("/base/informationInfo/addMobile");
 	}
 }

+ 0 - 1
src/main/java/com/jpsoft/smart/modules/base/controller/AlarmInfoController.java

@@ -7,7 +7,6 @@ import com.jpsoft.smart.modules.common.dto.MessageResult;
 import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 46 - 32
src/main/java/com/jpsoft/smart/modules/base/controller/InformationInfoController.java

@@ -6,6 +6,8 @@ import com.jpsoft.smart.modules.base.service.InformationInfoService;
 import com.jpsoft.smart.modules.common.dto.MessageResult;
 import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,38 +38,6 @@ public class InformationInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
-    @PostMapping("addMobile")
-    public MessageResult<InformationInfo> addMobile(@RequestBody InformationInfo informationInfo,@RequestAttribute String subject){
-        MessageResult<InformationInfo> msgResult = new MessageResult<>();
-
-        try {
-            informationInfo.setId(UUID.randomUUID().toString());
-            informationInfo.setDelFlag(false);
-            informationInfo.setCreateBy(subject);
-            informationInfo.setCreateTime(new Date());
-            informationInfo.setStatus("0");
-
-            int affectCount = informationInfoService.insert(informationInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(informationInfo);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
     @ApiOperation(value="添加信息")
     @PostMapping("add")
     public MessageResult<InformationInfo> add(@RequestBody InformationInfo informationInfo,@RequestAttribute String subject){
@@ -265,4 +235,48 @@ public class InformationInfoController {
 
         return msgResult;
     }
+
+
+    @PostMapping(value="addMobile")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="ownerId",value="户主ID",dataType="string",paramType = "query"),
+            @ApiImplicitParam(name="content",value="内容",dataType="string",paramType = "query"),
+            @ApiImplicitParam(name="type",value="类型/1投诉/2报修",dataType="string",paramType = "query")
+    })
+    public MessageResult<InformationInfo> addMobile(
+            String ownerId,
+            String content,
+            String type){
+        MessageResult<InformationInfo> msgResult = new MessageResult<>();
+        InformationInfo informationInfo = new InformationInfo();
+        try {
+            informationInfo.setId(UUID.randomUUID().toString());
+            informationInfo.setDelFlag(false);
+            informationInfo.setCreateBy(ownerId);
+            informationInfo.setCreateTime(new Date());
+            informationInfo.setStatus("0");
+            informationInfo.setContent(content);
+            informationInfo.setOwnerId(ownerId);
+            informationInfo.setType(type);
+            informationInfo.setCommunity("1-2-1601");
+
+            int affectCount = informationInfoService.insert(informationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(informationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

+ 0 - 2
src/main/java/com/jpsoft/smart/modules/base/controller/OwnerInfoController.java

@@ -27,7 +27,6 @@ public class OwnerInfoController {
     @GetMapping("create")
     public MessageResult<OwnerInfo> create(){
         MessageResult<OwnerInfo> msgResult = new MessageResult<>();
-
         OwnerInfo ownerInfo = new OwnerInfo();
 
         msgResult.setData(ownerInfo);
@@ -200,7 +199,6 @@ public class OwnerInfoController {
 
         //当前用户ID
         System.out.println(subject);
-
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();

+ 1 - 0
src/main/java/com/jpsoft/smart/modules/base/dao/OwnerInfoDAO.java

@@ -15,5 +15,6 @@ public interface OwnerInfoDAO {
 	OwnerInfo get(String id);
 	int delete(String id);
 	List<OwnerInfo> list();
+	List<Map> findByTel(String tel);
 	List<OwnerInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

+ 1 - 0
src/main/java/com/jpsoft/smart/modules/base/service/OwnerInfoService.java

@@ -14,5 +14,6 @@ public interface OwnerInfoService {
 	int update(OwnerInfo model);
 	int delete(String id);
 	List<OwnerInfo> list();
+	List<Map> findByTel(String tel);
 	Page<OwnerInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

+ 50 - 45
src/main/java/com/jpsoft/smart/modules/base/service/impl/OwnerInfoServiceImpl.java

@@ -14,57 +14,62 @@ import java.util.List;
 import java.util.Map;
 
 @Transactional
-@Component(value="ownerInfoService")
+@Component(value = "ownerInfoService")
 public class OwnerInfoServiceImpl implements OwnerInfoService {
-	@Resource(name="ownerInfoDAO")
-	private OwnerInfoDAO ownerInfoDAO;
+    @Resource(name = "ownerInfoDAO")
+    private OwnerInfoDAO ownerInfoDAO;
 
-	@Override
-	public OwnerInfo get(String id) {
-		// TODO Auto-generated method stub
-		return ownerInfoDAO.get(id);
-	}
+    @Override
+    public OwnerInfo get(String id) {
+        // TODO Auto-generated method stub
+        return ownerInfoDAO.get(id);
+    }
 
-	@Override
-	public int insert(OwnerInfo model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return ownerInfoDAO.insert(model);
-	}
+    @Override
+    public int insert(OwnerInfo model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(OwnerInfo model) {
-		// TODO Auto-generated method stub
-		return ownerInfoDAO.update(model);		
-	}
+        return ownerInfoDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return ownerInfoDAO.delete(id);
-	}
+    @Override
+    public int update(OwnerInfo model) {
+        // TODO Auto-generated method stub
+        return ownerInfoDAO.update(model);
+    }
 
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = ownerInfoDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<OwnerInfo> list() {
-		// TODO Auto-generated method stub
-		return ownerInfoDAO.list();
-	}
-		
-	@Override
-	public Page<OwnerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<OwnerInfo> page = PageHelper.startPage(1,10).doSelectPage(()->{
-            ownerInfoDAO.search(searchParams,sortList);
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return ownerInfoDAO.delete(id);
+    }
+
+    @Override
+    public List<Map> findByTel(String tel) {
+        return ownerInfoDAO.findByTel(tel);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = ownerInfoDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<OwnerInfo> list() {
+        // TODO Auto-generated method stub
+        return ownerInfoDAO.list();
+    }
+
+    @Override
+    public Page<OwnerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<OwnerInfo> page = PageHelper.startPage(1, 10).doSelectPage(() -> {
+            ownerInfoDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 }

+ 14 - 0
src/main/resources/mapper/base/OwnerInfo.xml

@@ -138,4 +138,18 @@ id_,create_by,create_time,update_by,update_time,del_flag,name_,tel_,park_,buildi
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+
+	<select id="findByTel" resultType="map">
+		SELECT
+		id_ as id,
+		name_ as name,
+		tel_ as tel,
+		is_access_control as isAccessControl,
+		is_the_public as isThePublic
+		FROM
+		base_owner_info
+		WHERE
+		del_flag = 0
+		and tel_ = #{0}
+	</select>
 </mapper>