Merge branch 'dev/icss' into debug

icss-service/src/main/java/com/diagbot/facade/BuriedSomeStatisticalFacade.java

@@ -28,7 +28,7 @@ public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImp
 	 * @param buriedSomeStatisticalVO
 	 * @return
 	 */
-	public boolean saveBuriedSomeStatistical(@Valid BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
+	public boolean saveBuriedSomeStatistical(BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
 		List<BuriedSomeStatistical>  buriedList = new ArrayList<BuriedSomeStatistical>();
 		List<Taggeds> taggeds = buriedSomeStatisticalVO.getTaggeds();
 		for(Taggeds taggedsNew : taggeds){	

icss-service/src/main/java/com/diagbot/facade/DoctorPageModeFacade.java

@@ -12,6 +12,8 @@ import com.diagbot.service.impl.DoctorPageModeServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
+import org.springframework.transaction.annotation.Transactional;
+
 /**
  * 
  * @author wangfeng
@@ -26,6 +28,7 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
 	 * @param doctorPageModeVO
 	 * @return
 	 */
+	@Transactional
 	public boolean saveDoctorPageMode(@Valid DoctorPageModeVO doctorPageModeVO) {
 		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
 		doctorPageModeWrapper.eq("doctor_id", doctorPageModeVO.getDoctorId()).eq("is_deleted", IsDeleteEnum.N.getKey());

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -26,6 +26,7 @@ import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description
@@ -47,6 +48,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	 * @param saveInquiryVO
 	 * @return
 	 */
+	@Transactional
 	public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
 		SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
 		Date now = new Date();

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.service.impl.RetrievalServiceImpl;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.RetrievalVO;
 import org.springframework.stereotype.Component;
 
@@ -23,7 +24,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
      */
     public List<RetrievalDTO> getTagInfos(RetrievalVO retrievalVO) {
         List<RetrievalDTO> data =new ArrayList<>();
-        if(retrievalVO.getInputStr() == null || retrievalVO.getInputStr().isEmpty()){
+        if(StringUtil.isBlank(retrievalVO.getInputStr())){
             data = new ArrayList<>();
             return data;
         }

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -44,7 +44,6 @@ public class TemplateInfoController {
     		notes = "doctorId: 医生id<br>" +"dospitalId：医院编码<br>"+"deptId:部门id<br>")
     @PostMapping("/getByDoctorIdTemplates")
     @SysLogger("getByDoctorIdTemplates")
-    @Transactional
     public RespDTO<TemplateInfo> getByDoctorIdTemplate(@Valid @RequestBody TemplateInfoVO templateInfoVO) {
 
         List<TemplateInfoDTO> data = templateInfoFacade.findByDoctorIdTemplates(templateInfoVO);

icssman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -25,13 +25,13 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         http
                 .csrf().disable()
                 .authorizeRequests()
-                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
-                .antMatchers("/file/upload").permitAll()
-                .antMatchers("/introduceInfo/saveIntroduce").permitAll()
-                .antMatchers("/questionInfo/delete").permitAll()
-                .antMatchers("/questionInfo/index").permitAll()
-                .antMatchers("/**").authenticated();
-        //        .antMatchers("/**").permitAll();
+//                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
+//                .antMatchers("/file/upload").permitAll()
+//                .antMatchers("/introduceInfo/saveIntroduce").permitAll()
+//                .antMatchers("/questionInfo/delete").permitAll()
+//                .antMatchers("/questionInfo/index").permitAll()
+//                .antMatchers("/**").authenticated();
+                .antMatchers("/**").permitAll();
     }
 
 

icssman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -33,40 +33,40 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
 
     @Override
     public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
-        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
-        String url, method;
-        if (matchPermitAllUrl(request)) {
-            return;
-        }
-        if ("anonymousUser".equals(authentication.getPrincipal())) {
-            throw new AccessDeniedException("no right");
-        } else {
-            //验证token有效性
-            String tokenStr = HttpUtils.getHeaders(request).get("Authorization");
-            if (StringUtil.isNotEmpty(tokenStr)) {
-                Token token = new Token();
-                tokenStr = tokenStr.replaceFirst("Bearer ", "");
-                token.setToken(tokenStr);
-                RespDTO<Boolean> res = userServiceClient.verifyToken(token);
-                if (res == null || !"0".equals(res.code)) {
-                    throw new AccountExpiredException("token expire");
-                }
-                if (!res.data) {
-                    throw new AccountExpiredException("token expire");
-                }
-            }
-            for (GrantedAuthority ga : authentication.getAuthorities()) {
-                String[] authority = ga.getAuthority().split(";");
-                url = authority[0];
-                method = authority[1];
-                if (matchers(url, request)) {
-                    if (method.equals(request.getMethod()) || "ALL".equals(method)) {
-                        return;
-                    }
-                }
-            }
-        }
-        throw new AccessDeniedException("no right");
+//        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
+//        String url, method;
+//        if (matchPermitAllUrl(request)) {
+//            return;
+//        }
+//        if ("anonymousUser".equals(authentication.getPrincipal())) {
+//            throw new AccessDeniedException("no right");
+//        } else {
+//            //验证token有效性
+//            String tokenStr = HttpUtils.getHeaders(request).get("Authorization");
+//            if (StringUtil.isNotEmpty(tokenStr)) {
+//                Token token = new Token();
+//                tokenStr = tokenStr.replaceFirst("Bearer ", "");
+//                token.setToken(tokenStr);
+//                RespDTO<Boolean> res = userServiceClient.verifyToken(token);
+//                if (res == null || !"0".equals(res.code)) {
+//                    throw new AccountExpiredException("token expire");
+//                }
+//                if (!res.data) {
+//                    throw new AccountExpiredException("token expire");
+//                }
+//            }
+//            for (GrantedAuthority ga : authentication.getAuthorities()) {
+//                String[] authority = ga.getAuthority().split(";");
+//                url = authority[0];
+//                method = authority[1];
+//                if (matchers(url, request)) {
+//                    if (method.equals(request.getMethod()) || "ALL".equals(method)) {
+//                        return;
+//                    }
+//                }
+//            }
+//        }
+//        throw new AccessDeniedException("no right");
     }
 
 

icssman-service/src/main/java/com/diagbot/web/DeptInfoController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/deptInfo")
+@SuppressWarnings("unchecked")
 @Api(value = "科室相关API", tags = { "科室相关API" })
 public class DeptInfoController {
 

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -28,6 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/deptVital")
+@SuppressWarnings("unchecked")
 @Api(value = "查体模板相关API", tags = { "查体模板相关API" })
 public class DeptVitalController {
 

icssman-service/src/main/java/com/diagbot/web/IntroduceDetailController.java

@@ -25,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/introduceDetail")
+@SuppressWarnings("unchecked")
 @Api(value = "提示信息明细维护相关API", tags = { "提示信息明细维护相关API" })
 public class IntroduceDetailController {
     @Autowired

icssman-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -31,6 +31,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/introduceInfo")
+@SuppressWarnings("unchecked")
 @Api(value = "提示信息维护相关API", tags = { "提示信息维护相关API" })
 public class IntroduceInfoController {
 

icssman-service/src/main/java/com/diagbot/web/IntroduceMapController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/introduceMap")
+@SuppressWarnings("unchecked")
 @Api(value = "提示信息与标签映射关系维护相关API", tags = { "提示信息与标签映射关系维护相关API" })
 public class IntroduceMapController {
 

icssman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -27,6 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/questionInfo")
+@SuppressWarnings("unchecked")
 @Api(value = "标签相关API——数据谨慎操作", tags = { "标签相关API——数据谨慎操作" })
 public class QuestionInfoController {
 

icssman-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/questionUsual")
+@SuppressWarnings("unchecked")
 @Api(value = "常用标签维护相关API", tags = { "常用标签维护相关API" })
 public class QuestionUsualController {
 

icssman-service/src/main/java/com/diagbot/web/RetrievalController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/retrieval")
+@SuppressWarnings("unchecked")
 @Api(value = "同义词维护相关API", tags = { "同义词维护相关API" })
 public class RetrievalController {
 

icssman-service/src/main/java/com/diagbot/web/VitalOrderController.java

@@ -28,6 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/vitalOrder")
+@SuppressWarnings("unchecked")
 @Api(value = "查体排序相关API", tags = { "查体排序相关API" })
 public class VitalOrderController {