1、添加BControl_facade基础类

2、添加排班明细信息facade控制器 3、修改dubbo消费端配置，添加排班明细服务

1、添加BControl_facade基础类
2、添加排班明细信息facade控制器 3、修改dubbo消费端配置，添加排班明细服务
徐烜
1 parent 45862b32
Showing 6 changed files with 254 additions and 43 deletions
pom.xml
src/main/java/com/bsth/controller/schedule/BController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController_dubbo.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController_dubbo.java
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml
@@ -301,6 +301,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
+            <!--<version>2.6.3</version>-->
             <version>2.5.3</version>
             <exclusions>
                 <exclusion>
@@ -327,6 +328,20 @@
             <artifactId>zkclient</artifactId>
             <version>0.3</version>
         </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.curator</groupId>-->
+            <!--<artifactId>curator-framework</artifactId>-->
+            <!--<version>4.0.1</version>-->
+            <!--<type>bundle</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.curator</groupId>-->
+            <!--<artifactId>curator-recipes</artifactId>-->
+            <!--<version>4.0.1</version>-->
+            <!--<type>bundle</type>-->
+        <!--</dependency>-->
         <!-- dubbo 需要的jar end -->
         <!-- common工程依赖 -->
@@ -371,6 +386,13 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+            <!--<plugin>-->
+                <!--<groupId>org.apache.felix</groupId>-->
+                <!--<artifactId>maven-bundle-plugin</artifactId>-->
+                <!--<extensions>true</extensions>-->
+            <!--</plugin>-->
+
 		</plugins>
 		<resources>
 			<resource>
+package com.bsth.controller.schedule;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.dto.PageRequestDto;
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.sys.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BController_facade<Id extends Serializable, DTO> {
+    @Autowired
+    private BServiceFacade<Id, DTO> bServiceFacade;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    //---------------- 设置操作用户 ----------------//
+    public void setCreateUserInfo(DTO dto, Integer userId, Date createDate) {
+        throw new PlanModuleException("子类必须override setCUserInfo方法！");
+    }
+    public void setUpdateUserInfo(DTO dto, Integer userId, Date updateDate) {
+        throw new PlanModuleException("子类必须override setUpdateUserInfo方法！");
+    }
+
+    //---------------- CRUD 操作 ----------------//
+    // Create操作
+    @RequestMapping(method = RequestMethod.POST)
+    public Map<String, Object> save(@RequestBody DTO dto, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        setCreateUserInfo(dto, sysUser.getId(), new Date());
+        setUpdateUserInfo(dto, sysUser.getId(), new Date());
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto_saved = bServiceFacade.save(dto);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto_saved);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // Update操作
+    @RequestMapping(value="/{id}", method = RequestMethod.POST)
+    public Map<String, Object> update(@RequestBody DTO dto, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        setUpdateUserInfo(dto, sysUser.getId(), new Date());
+
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto_updated = bServiceFacade.save(dto);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto_updated);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // Research操作
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Map<String, Object> findById(@PathVariable("id") Id id) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            DTO dto = bServiceFacade.findById(id);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", dto);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    // 查询所有操作
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Map<String, Object> list(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            List<DTO> tList = bServiceFacade.list(param);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", tList);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // 分页查询操作
+    @RequestMapping(method = RequestMethod.GET)
+    public Map<String, Object> list(
+            @RequestParam Map<String, Object> map,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam(defaultValue = "id") String order,
+            @RequestParam(defaultValue = "DESC") String direction) {
+        PageRequestDto pageRequestDto = PageRequestDto.getBuilder()
+                .setPage(page)
+                .setSize(size)
+                .setOrder(order)
+                .setDirection(direction)
+                .build();
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("data", bServiceFacade.list(map, pageRequestDto));
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    // Delete操作
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Map<String, Object> delete(@PathVariable("id") Id id, HttpSession httpSession) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 由于种种原因，这里不保存用户和操作时间了
+            bServiceFacade.delete(id);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+}
 package com.bsth.controller.schedule.core;
-import com.bsth.common.ResponseCode;
-import com.bsth.control_v2.plan_module.common.dto.PageRequestDto;
-import com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade;
-import com.google.common.base.Splitter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import com.bsth.control_v2.plan_module.common.dto.schedule.PlanDto;
+import com.bsth.controller.schedule.BController_facade;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @RequestMapping("spc")
-public class SchedulePlanController_dubbo {
-    @Autowired
-    private PlanServiceFacade planServiceFacade;
-
-    //---------------- CRUD 操作 ----------------//
-    // 分页查询操作
-    @RequestMapping(method = RequestMethod.GET)
-    public Map<String, Object> list(
-            @RequestParam Map<String, Object> map,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size,
-            @RequestParam(defaultValue = "id") String order,
-            @RequestParam(defaultValue = "DESC") String direction) {
-
-        PageRequestDto pageRequestDto = PageRequestDto.getBuilder()
-                .setPage(page)
-                .setSize(size)
-                .setOrder(order)
-                .setDirection(direction)
-                .build();
-        Map<String, Object> rtn = new HashMap<>();
-        rtn.put("data", planServiceFacade.list(map, pageRequestDto));
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-
-    }
+public class SchedulePlanController_dubbo extends BController_facade<Long, PlanDto> {
     // TODO
 }
@@ -15,8 +15,8 @@ import java.util.Map;
 /**
  * Created by xu on 17/5/1.
  */
-@RestController
-@RequestMapping("spic")
+//@RestController
+//@RequestMapping("spic")
 public class SchedulePlanInfoController extends BController<SchedulePlanInfo, Long> {
     @Autowired
     private SchedulePlanInfoService schedulePlanInfoService;
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.dto.schedule.PlanInfoDto;
+import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.PlanInfoServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade;
+import com.bsth.controller.schedule.BController_facade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("spic")
+public class SchedulePlanInfoController_dubbo extends BController_facade<Long, PlanInfoDto> {
+    @Autowired
+    private PlanInfoServiceFacade planInfoServiceFacade;
+
+    @Override
+    public void setCreateUserInfo(PlanInfoDto planInfoDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        planInfoDto.setCreateBy(userDto);
+        planInfoDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(PlanInfoDto planInfoDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        planInfoDto.setUpdateBy(userDto);
+        planInfoDto.setUpdateDate(updateDate);
+    }
+
+    @RequestMapping(value = "/groupextinfos/{xlid}/{date}", method = RequestMethod.GET)
+    public Map<String, Object> findGroupInfoExt(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "date") Date scheduleDate) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("data", planInfoServiceFacade.findPlanGroupInfo(xlid, scheduleDate));
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+
+    @RequestMapping(value = "/lastestsd/{xlid}", method = RequestMethod.GET)
+    public Map<String, Object> findLastestPlanInfoDate(
+            @PathVariable(value = "xlid") Integer xlid) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("data", planInfoServiceFacade.findLastestPlanInfoDate(xlid));
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+}
@@ -12,8 +12,9 @@
     <!-- 注册中心地址 -->
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181" />
-    <!-- 用户服务接口 -->
+    <!-- 计划排班服务接口 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade" id="planServiceFacadeImpl" check="false" />
+    <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanInfoServiceFacade" id="planInfoServiceFacadeImpl" check="false" />
 </beans>
 \ No newline at end of file