傅行帆 5 years ago
parent
commit
e47c17c03c

+ 51
- 5
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java View File

66
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
66
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
67
                                        @RequestParam(value ="drainageId",required = false) Integer drainageId,
67
                                        @RequestParam(value ="drainageId",required = false) Integer drainageId,
68
                                        @RequestParam(value ="name",required = false) String name,
68
                                        @RequestParam(value ="name",required = false) String name,
69
-                                       @RequestParam(value ="miniapp",required = false) Integer miniapp,
69
+                                       @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
70
+                                       @RequestParam(value ="status",required = false) Integer status,
70
                                        HttpServletRequest request){
71
                                        HttpServletRequest request){
71
         ResponseBean responseBean = new ResponseBean();
72
         ResponseBean responseBean = new ResponseBean();
72
         try {
73
         try {
74
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
75
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
75
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
76
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
76
             queryWrapper.eq("org_id",getOrgId(request));
77
             queryWrapper.eq("org_id",getOrgId(request));
77
-            queryWrapper.eq(null != miniapp,"is_miniapp",miniapp);
78
+            queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
79
+            queryWrapper.eq(null != status,"status",status);
78
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
80
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
79
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
81
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
80
             queryWrapper.orderByDesc("create_date");
82
             queryWrapper.orderByDesc("create_date");
208
      * 根据id查询对象
210
      * 根据id查询对象
209
      * @param id  实体ID
211
      * @param id  实体ID
210
      */
212
      */
211
-    @RequestMapping(value="/taDrainage/{id}",method= RequestMethod.GET)
212
-    public ResponseBean taDrainageGet(@PathVariable Integer id){
213
+    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.GET)
214
+    public ResponseBean taDrainageGet(@PathVariable Integer id,HttpServletRequest request){
213
         ResponseBean responseBean = new ResponseBean();
215
         ResponseBean responseBean = new ResponseBean();
214
         try {
216
         try {
215
-            responseBean.addSuccess(iTaDrainageService.getById(id));
217
+            TaDrainage taDrainage = iTaDrainageService.getById(id);
218
+            QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
219
+            queryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
220
+            queryWrapper.eq("target_id",taDrainage.getDrainageId());
221
+            queryWrapper.eq("org_id",getOrgId(request));
222
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
223
+            if (null != taThirdPartyMiniappConfig){
224
+                taDrainage.setAppid(taThirdPartyMiniappConfig.getAppid());
225
+                taDrainage.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
226
+            }
227
+            responseBean.addSuccess(taDrainage);
216
         }catch (Exception e){
228
         }catch (Exception e){
217
             e.printStackTrace();
229
             e.printStackTrace();
218
             logger.error("taDrainageDelete -=- {}",e.toString());
230
             logger.error("taDrainageDelete -=- {}",e.toString());
220
         }
232
         }
221
         return responseBean;
233
         return responseBean;
222
     }
234
     }
235
+
236
+    /**
237
+     * 更改上架下架状态
238
+     * @param id  实体ID
239
+     * @param taDrainage 实体对象
240
+     * @return
241
+     */
242
+    @RequestMapping(value="/admin/taDrainage/exchange/{id}",method= RequestMethod.PUT)
243
+    public ResponseBean exchangeDrainage(@PathVariable Integer id,
244
+                                         @RequestBody TaDrainage taDrainage){
245
+        ResponseBean responseBean = new ResponseBean();
246
+        try {
247
+            taDrainage.setDrainageId(id);
248
+            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
249
+                taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
250
+            }else{
251
+                if (taDrainage.getEndDate().isBefore(LocalDateTime.now())){
252
+                    responseBean.addError("已过下架时间,无法上架");
253
+                    return responseBean;
254
+                }
255
+                taDrainage.setStatus(CommConstant.STATUS_NORMAL);
256
+            }
257
+            if (iTaDrainageService.updateById(taDrainage)){
258
+                responseBean.addSuccess(taDrainage);
259
+            }else {
260
+                responseBean.addError("fail");
261
+            }
262
+        }catch (Exception e){
263
+            e.printStackTrace();
264
+            logger.error("taDrainageUpdate -=- {}",e.toString());
265
+            responseBean.addError(e.getMessage());
266
+        }
267
+        return responseBean;
268
+    }
223
 }
269
 }

+ 4
- 0
src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java View File

69
     private String shareImg ;
69
     private String shareImg ;
70
     /** 分享标题 */
70
     /** 分享标题 */
71
     private String shareTitle ;
71
     private String shareTitle ;
72
+    /** 中间页飞机图 */
73
+    private String middleImg ;
74
+    /** 状态 */
75
+    private Integer status ;
72
 
76
 
73
     @TableField(exist = false)
77
     @TableField(exist = false)
74
     private String appid;
78
     private String appid;