Merge branch 'master_after20' into master_cj_zq

@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -106,4 +107,14 @@ public class CorePersonnelController extends DefaultBaseController {
 
 
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    @Scheduled(cron = "0 0 0 1 1 ?")
+    @ApiOperation("自动更新年龄")
+    @GetMapping("/updateAge")
+    public InvokeResult<Void> updateAge() {
+
+        corePersonnelService.updateAge();
+
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -17,6 +17,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -106,4 +107,14 @@ public class CorePersonnelHistoryController extends DefaultBaseController {
 
 
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    @Scheduled(cron = "0 0 0 1 1 ?")
+    @ApiOperation("自动更新年龄")
+    @GetMapping("/updateAge")
+    public InvokeResult<Void> updateAge() {
+
+        corePersonnelHistoryService.updateAge();
+
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -242,6 +242,15 @@ public class CorePersonnelHistoryServiceImpl extends BaseMpServiceImpl<CorePerso
         return data;
         return data;
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "年龄自动+1，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateAge() {
+
+        getBaseMapper().updateAge();
+    }
+
+
     @CacheEvict(value = CorePersonnelHistory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @CacheEvict(value = CorePersonnelHistory.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {

@@ -146,6 +146,14 @@ public class CorePersonnelServiceImpl extends BaseMpServiceImpl<CorePersonnelMap
         getBaseMapper().deleteById(id);
         getBaseMapper().deleteById(id);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "年龄自动+1，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateAge() {
+
+        getBaseMapper().updateAge();
+    }
+
     @CacheEvict(value = CorePersonnel.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @CacheEvict(value = CorePersonnel.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {

@@ -21,4 +21,6 @@ public interface CorePersonnelHistoryMapper extends BaseMapper<CorePersonnelHist
      * @return
      * @return
      */
      */
     List<CorePersonnelHistory> query(@Param("vo") QueryCorePersonnelHistoryVo vo);
     List<CorePersonnelHistory> query(@Param("vo") QueryCorePersonnelHistoryVo vo);
+
+    void updateAge();
 }
 }

@@ -25,4 +25,6 @@ public interface CorePersonnelMapper extends BaseMapper<CorePersonnel> {
      * @return
      * @return
      */
      */
     List<CorePersonnel> query(@Param("vo") QueryCorePersonnelVo vo);
     List<CorePersonnel> query(@Param("vo") QueryCorePersonnelVo vo);
+
+    void updateAge();
 }
 }

@@ -57,4 +57,6 @@ public interface CorePersonnelHistoryService extends BaseMpService<CorePersonnel
     void updateWithChangeInfo(List<CorePersonnelHistory> beforeList, List<CorePersonnelHistory> afterList);
     void updateWithChangeInfo(List<CorePersonnelHistory> beforeList, List<CorePersonnelHistory> afterList);
 
 
     CorePersonnelHistory changeCorePersonnel(CorePersonnel vo);
     CorePersonnelHistory changeCorePersonnel(CorePersonnel vo);
+
+    void updateAge();
 }
 }

@@ -53,4 +53,6 @@ public interface CorePersonnelService extends BaseMpService<CorePersonnel> {
      */
      */
     void deleteById(String id);
     void deleteById(String id);
 
 
+    void updateAge();
+
 }
 }

@@ -59,4 +59,10 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <update id="updateAge">
+        UPDATE core_personnel
+        SET age = CAST(age AS UNSIGNED) + 1
+        WHERE age REGEXP '^[0-9]+$';
+    </update>
 </mapper>
 </mapper>

@@ -60,4 +60,9 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+    <update id="updateAge">
+        UPDATE core_personnel
+        SET age = CAST(age AS UNSIGNED) + 1
+        WHERE age REGEXP '^[0-9]+$';
+    </update>
 </mapper>
 </mapper>