Merge remote-tracking branch 'origin/dev/one' into dev/one

# Conflicts:
#	diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java
#	diagbotman-service/src/main/java/com/diagbot/web/MoreServiceController.java
#	diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -110,7 +110,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
             serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
         } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial.getKey())) {
             serviceToken.setStartingDate(new Date());
-            serviceToken.setExpiringDate(DateUtil.add(serviceToken.getStartingDate(), Calendar.DAY_OF_MONTH, 7));
+            serviceToken.setExpiringDate(DateUtil.addDay(serviceToken.getStartingDate(), 7));
         }
         serviceTokenFacade.save(serviceToken);
         productServiceDTO.setServiceToken(serviceToken);

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -27,6 +27,7 @@ import java.util.List;
 @RestController
 @Api(value="朗通产品API", tags={"朗通产品API"})
 @RequestMapping("/diagLantoneProduct")
+@SuppressWarnings("unchecked")
 public class DiagLantoneProductController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
@@ -57,14 +58,16 @@ public class DiagLantoneProductController {
             notes = "id：根据产品id修改产品内容，必填<br>")
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
+    @Transactional
     public RespDTO<LantoneProduct> updateProduct(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(lantoneProduct));
     }
 
-    @ApiOperation(value = "删除产品[by:wangyu]",
+    @ApiOperation(value = "删除产品",
             notes = "id：根据产品id删除产品，必填<br>")
     @PostMapping("/deleteProduct")
     @SysLogger("deleteProduct")
+    @Transactional
     public RespDTO<LantoneProduct> deleteProduct(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(lantoneProduct));
     }
@@ -73,6 +76,7 @@ public class DiagLantoneProductController {
             notes = "id：根据产品id更改产品状态，必填<br>")
     @PostMapping("/productStatus")
     @SysLogger("productStatus")
+    @Transactional
     public RespDTO<LantoneProduct> productStatus(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.productStatus(lantoneProduct));
     }

diagbotman-service/src/main/java/com/diagbot/web/DiagOrderDetailsController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/diagOrderDetails")
 @Api(value="订单明细API", tags={"订单明细API"})
+@SuppressWarnings("unchecked")
 public class DiagOrderDetailsController {
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;

diagbotman-service/src/main/java/com/diagbot/web/EnumsController.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 @RestController
 @Api(value="产品中心枚举数据获取API", tags={"产品中心枚举数据获取API"})
+@SuppressWarnings("unchecked")
 public class EnumsController {
     @Autowired
     private EnumsDataFacade enumsDataFacade;

diagbotman-service/src/main/java/com/diagbot/web/MoreServiceController.java

@@ -11,6 +11,8 @@ import com.diagbot.vo.AddOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
  * @time: 2018/9/17 18:28
  */
 @RestController
-@Api(value="diagbot更多服务API", tags={"diagbot更多服务API"})
+@Api(value="用户更多服务API", tags={"用户更多服务API"})
 @RequestMapping("/morServices")
+@SuppressWarnings("unchecked")
 public class MoreServiceController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
@@ -41,6 +44,7 @@ public class MoreServiceController {
     @ApiOperation(value = "生成订单", notes = "根据用户所选择的产品生成订单")
     @PostMapping("/addOrder")
     @SysLogger("addOrder")
+    @Transactional
     public RespDTO addOrder( @RequestBody AddOrderVO addOrderVO){
         return RespDTO.onSuc(productOrderFacade.addOrders(addOrderVO));
     }

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -1,5 +1,17 @@
 package com.diagbot.web;
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
@@ -43,6 +55,7 @@ import java.util.List;
 @Api(value="控制台-产品操作API", tags={"控制台-产品操作API"})
 @RestController
 @RequestMapping("/productOrder")
+@SuppressWarnings("unchecked")
 public class ProductOrderController {
 	@Autowired
 	private LantoneProductFacade lantoneProductFacade;
@@ -93,10 +106,7 @@ public class ProductOrderController {
 	public RespDTO<WaitExamOrderCouDTO> waitExamOrderCou() {
 		return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
 	}
-	
-	
-	
-	   
+
 	@ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")
     @SysLogger("getInformationAvailableByUserId")
@@ -108,6 +118,7 @@ public class ProductOrderController {
 	@ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
 	@PostMapping("/startAndendByuserId")
 	@SysLogger("startAndendByuserId")
+	@Transactional
 	public RespDTO<StartAndendByUserIdVO> startAndendByuserId(@RequestBody @Valid StartAndendByUserIdVO startAndendByUserIdVO) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(startAndendByUserIdVO.getUserId());
@@ -125,6 +136,7 @@ public class ProductOrderController {
 	@ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
 	@PostMapping("/delInformationAvailable")
 	@SysLogger("delInformationAvailable")
+	@Transactional
 	public RespDTO delInformationAvailable(@RequestParam Long userId, Long productId) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(userId);
@@ -141,6 +153,7 @@ public class ProductOrderController {
 	@ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
 	@PostMapping("/modifyOpeningTime")
 	@SysLogger("modifyOpeningTime")
+	@Transactional
 	public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(modifyOpeningTimeVO.getUserId());

diagbotman-service/src/main/java/com/diagbot/web/ProductServiceController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @Api(value="产品服务端API", tags={"产品服务端API"})
 @RequestMapping("/productService")
+@SuppressWarnings("unchecked")
 public class ProductServiceController {
     @Autowired
     private ProductServiceFacade productServiceFacade;

diagbotman-service/src/main/java/com/diagbot/web/ServiceInfoController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceInfo;
-import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.facade.ServiceInfoFacade;
 import com.diagbot.vo.ServiceSaveVO;
 import io.swagger.annotations.Api;
@@ -32,6 +31,7 @@ import java.util.List;
 @RestController
 @Api(value="用户服务API", tags={"用户服务API"})
 @RequestMapping("/serviceInfo")
+@SuppressWarnings("unchecked")
 public class ServiceInfoController {
 
     @Autowired

diagbotman-service/src/main/java/com/diagbot/web/ServiceTokenController.java

@@ -32,6 +32,7 @@ import javax.validation.Valid;
 @RestController
 @Api(value="服务令牌API", tags={"服务令牌API"})
 @RequestMapping("/serviceToken")
+@SuppressWarnings("unchecked")
 public class ServiceTokenController {
 
     @Autowired

user-service/src/main/java/com/diagbot/web/EnumsController.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 @RestController
 @Api(value="用户枚举数据获取API", tags={"用户枚举数据获取API"})
+@SuppressWarnings("unchecked")
 public class EnumsController {
     @Autowired
     private EnumsDataFacade enumsDataFacade;

user-service/src/main/java/com/diagbot/web/UserAuthenticationController.java

@@ -1,17 +1,6 @@
 package com.diagbot.web;
 
 
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
@@ -19,9 +8,17 @@ import com.diagbot.dto.UserAuthenticationDTO;
 import com.diagbot.dto.WaitAuthenDTO;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @Api(value="用户认证API", tags={"用户认证API"})
 @RequestMapping("/userAuthentication")
+@SuppressWarnings("unchecked")
 public class UserAuthenticationController {
     @Autowired
     private UserAuthenticationFacade userAuthenticationFacade;

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -36,6 +36,7 @@ import java.util.Map;
 @RestController
 @Api(value="用户操作API", tags={"用户操作API"})
 @RequestMapping("/user")
+@SuppressWarnings("unchecked")
 public class UserController {
 
     @Autowired
@@ -76,6 +77,7 @@ public class UserController {
                     "diffPassword：值为Y，表示修改前和修改后密码不相同<br>")
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
+    @Transactional
     public RespDTO<Boolean> resetPassword(String username, String password, String diffPassword){
         return  userFacade.resetPassword(username, password, diffPassword);
     }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -1,21 +1,5 @@
 package com.diagbot.web;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
@@ -35,9 +19,22 @@ import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 外部用户信息
@@ -47,6 +44,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @Api(value = "用户信息和机构信息API", tags = { "用户信息和机构信息API" })
 @RequestMapping("/userInfo")
+@SuppressWarnings("unchecked")
 public class UserInfoController {
 
 	@Autowired
@@ -73,6 +71,7 @@ public class UserInfoController {
 	@ApiOperation(value = "修改用户信息和机构信息", notes = "用户信息和机构信息")
 	@PostMapping("/updateUserInfoAll")
 	@SysLogger("updateUserInfoAll")
+	@Transactional
 	public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
 			@Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
 		Map<String, Object> userMap = new HashMap<String, Object>();
@@ -95,6 +94,7 @@ public class UserInfoController {
 	@ApiOperation(value = "审核用户信息和机构信息", notes = "审核用户信息和机构信息")
 	@PostMapping("/auditUserInfoAll")
 	@SysLogger("auditUserInfoAll")
+	@Transactional
 	public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
 		Map<String, Object> auditMap = new HashMap<String, Object>();
 		auditMap.put("userId", userInfoAuditVO.getUserId());
@@ -115,6 +115,7 @@ public class UserInfoController {
 	@ApiOperation(value = "删除用户信息和机构信息", notes = "用户信息和机构信息")
 	@PostMapping("/updateDeleted")
 	@SysLogger("updateDeleted")
+	@Transactional
 	public RespDTO updateDeleted(@RequestParam String userId) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("userId", userId);
@@ -137,6 +138,7 @@ public class UserInfoController {
 	@ApiOperation(value = "添加构信息", notes = "机构信息")
 	@PostMapping("/addOrganization")
 	@SysLogger("addOrganization")
+	@Transactional
 	public RespDTO<OrganizationVO> addOrganization(@Valid @RequestBody OrganizationVO organizationVO) {
 
 		String organizationName = organizationVO.getOrganizationName();
@@ -166,6 +168,7 @@ public class UserInfoController {
 	@ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
 	@PostMapping("/addUserInfo")
 	@SysLogger("addUserInfo")
+	@Transactional
 	public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO userAndOrganizationVO) {
 		// TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
 		// User user = new User();

user-service/src/main/java/com/diagbot/web/VerController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 @RestController
 @Api(value="用户验证API", tags={"用户手机图片验证API"})
 @RequestMapping("/userver")
+@SuppressWarnings("unchecked")
 public class VerController {
     @Autowired
     private VerFacade verFacade;
@@ -33,7 +34,7 @@ public class VerController {
      * 获取图片验证码
      * @return 图片验证码包括图片验证码唯一标志和图片信息
      */
-    @ApiOperation(value = "获取图片验证码", notes = "获取图片验证码包括图片验证码唯一标志和图片信息")
+    @ApiOperation(value = "获取图片验证码[by:zhoutg]", notes = "获取图片验证码包括图片验证码唯一标志和图片信息")
     @PostMapping("/getImgVerification")
     @SysLogger("getImgVerification")
     public RespDTO<ImgVerCreatDTO> getImgVerification(){