Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java
#	src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * <p>
-    * 联系人表  前端控制器
-    * </p>
+ * 联系人表  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-03-18
 
 
     /**
-     * 分页查询列表
+     * 条件查询联系人列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param contactName
+     * @param telephone
+     * @param phone
+     * @param job
      * @return
      */
-    @RequestMapping(value="/taContact",method= RequestMethod.GET)
-    public ResponseBean taContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
+    public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               String contactName, String telephone, String phone, String job) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name", contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone", telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone", phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job", job);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no", "create_date");
 
             IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactList -=- {}",e.toString());
+            logger.error("taContactList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 保存对象
+     *
      * @param taContact 实体对象
      * @return
      */
-    @RequestMapping(value="/taContact",method= RequestMethod.POST)
-    public ResponseBean taContactAdd(@RequestBody TaContact taContact){
+    @RequestMapping(value = "/channel/taContact", method = RequestMethod.POST)
+    public ResponseBean taContactAdd(@RequestBody TaContact taContact) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContactService.save(taContact)){
+            taContact.setCreateDate(LocalDateTime.now());
+            taContact.setStatus(CommConstant.STATUS_NORMAL);
+            if (iTaContactService.save(taContact)) {
                 responseBean.addSuccess(taContact);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactAdd -=- {}",e.toString());
+            logger.error("taContactAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 批量删除
+     *
      */
     @ResponseBody
-    @RequestMapping(value="/taContact/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taContactDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContact/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaContactService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
+            List<TaContact> updateList = new ArrayList<>();
+            TaContact newContact;
+            for (TaContact taContact : taContactList) {
+                newContact = new TaContact();
+                newContact.setContactId(taContact.getContactId());
+                newContact.setStatus(CommConstant.STATUS_DELETE);
+                updateList.add(newContact);
             }
-        }catch (Exception e){
+
+            responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactDelete -=- {}",e.toString());
+            logger.error("taContactDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id        实体ID
      * @param taContact 实体对象
      * @return
      */
-    @RequestMapping(value="/taContact/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.PUT)
     public ResponseBean taContactUpdate(@PathVariable Integer id,
-                                        @RequestBody TaContact taContact){
+                                        @RequestBody TaContact taContact) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContactService.updateById(taContact)){
+            if (iTaContactService.updateById(taContact)) {
                 responseBean.addSuccess(taContact);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactUpdate -=- {}",e.toString());
+            logger.error("taContactUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taContact/{id}",method= RequestMethod.GET)
-    public ResponseBean taContactGet(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContact/{id}", method = RequestMethod.GET)
+    public ResponseBean taContactGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaContactService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactDelete -=- {}",e.toString());
+            logger.error("taContactDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.entity.TaSampleContact;
-import com.huiju.estateagents.sample.service.ITaContactService;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import org.slf4j.Logger;
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/ListH5SampleByCondition",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/ListH5SampleByCondition",method= RequestMethod.GET)
     public ResponseBean ListH5SampleByCondition(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        String sampleName){
             //使用分页插件
 		    IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like("sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no","create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/sample/controller/TaNoticeController.java

 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
     @Autowired
     public ITaNoticeService iTaNoticeService;
 
-
     /**
      * 条件查询通知列表
      *
      * @param type       类型
      * @return
      */
-    @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
+    @RequestMapping(value = "/channel/listNoticeByCondition", method = RequestMethod.GET)
     public ResponseBean listNoticeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                               String title, String targetType, String targetName, Integer status,
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value = "/admin/taNotice", method = RequestMethod.POST)
+    @RequestMapping(value = "/channel/taNotice", method = RequestMethod.POST)
     public ResponseBean taNoticeAdd(@RequestBody TaNotice taNotice) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taNotice.setCreateDate(LocalDateTime.now());
             if (iTaNoticeService.save(taNotice)) {
                 responseBean.addSuccess(taNotice);
             } else {
      * @param taNoticeList
      */
     @ResponseBody
-    @RequestMapping(value = "/admin/taNotice/batchDelete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean batchDelete(List<TaNotice> taNoticeList) {
+    @RequestMapping(value = "/channel/taNotice/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaNotice> taNoticeList) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaNoticeService.batchDelete(taNoticeList);
      * @param taNotice 实体对象
      * @return
      */
-    @RequestMapping(value = "/admin/taNotice/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/channel/taNotice/{id}", method = RequestMethod.PUT)
     public ResponseBean taNoticeUpdate(@PathVariable Integer id,
                                        @RequestBody TaNotice taNotice) {
         ResponseBean responseBean = new ResponseBean();
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taNotice/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/channel/taNotice/{id}", method = RequestMethod.GET)
     public ResponseBean taNoticeGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
         }
         return responseBean;
     }
+
+    /**
+     * 条件查询通知列表-admin
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param type       类型 目前默认 sample
+     * @return
+     */
+    @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
+    public ResponseBean listNoticeByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String type) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);
+            logger.info("TaNoticeController.listNoticeByConditionForAdmin 返回结果：" + JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("listNoticeByConditionForAdmin -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/sample/mapper/TaNoticeMapper.java

                                           @Param("targetName") String targetName,
                                           @Param("status") Integer status,
                                           @Param("type") String type);
+
+    IPage<TaNotice> listNoticeByConditionForAdmin(IPage<TaNotice> pg,
+                                          @Param("type") String type);
 }

src/main/java/com/huiju/estateagents/sample/service/ITaNoticeService.java

     ResponseBean listNoticeByCondition(Integer pageNum, Integer pageSize, String title, String targetType, String targetName,
                                        Integer status, String type);
 
+    ResponseBean listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, String type);
+
     /**
      * 批量删除
      *

src/main/java/com/huiju/estateagents/sample/service/impl/TaNoticeServiceImpl.java

         return responseBean;
     }
 
+    @Override
+    public ResponseBean listNoticeByConditionForAdmin(Integer pageNum, Integer pageSize, String type) {
+        log.info("TaNoticeServiceImpl.listNoticeByConditionForAdmin 接收参数：pageNum:{},pageSize:{},type:{}",
+                pageNum, pageSize, type);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //使用分页插件
+        IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
+        pg = taNoticeMapper.listNoticeByConditionForAdmin(pg, type);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
     @Override
     public ResponseBean batchDelete(List<TaNotice> taNoticeList) {
         ResponseBean responseBean = new ResponseBean();

src/main/resources/mapper/sample/TaNoticeMapper.xml

         FROM
             ta_notice t
             LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
-        <where>
+        where
+            t.`status` != -1
             <if test="title != null and title != ''">
                 t.title like CONCAT('%',#{title}, '%')
             </if>
             <if test="status != null">
                 AND t.`status` = #{status}
             </if>
-        </where>
+        ORDER BY
+            t.order_no DESC,t.create_date DESC
+    </select>
+
+    <select id="listNoticeByConditionForAdmin" resultType="com.huiju.estateagents.sample.entity.TaNotice">
+        SELECT
+            t.*,
+            t2.sample_name targetName
+        FROM
+            ta_notice t
+            LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
+        where
+            t.`status` == 1
+            AND t.invalid_time &gt;= NOW( )
         ORDER BY
             t.order_no DESC,t.create_date DESC
     </select>